diff --git a/README.md b/README.md index c4ef9c6..93ca9e9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# cookiecutter-openstack-puppet-modules +# puppet-openstack-cookiecutter Cookiecutter template for a compliant Openstack puppet-modules @@ -12,13 +12,13 @@ There are two ways to create the boilerplate for the puppet module. ### Locally - 1. Clone locally the [cookiecutter-openstack-puppet-modules](https://github.com/enovance/cookiecutter-openstack-puppet-modules.git) repository. + 1. Clone locally the [puppet-openstack-cookiecutter](https://github.com/openstack/puppet-openstack-cookiecutter.git) repository. 2. Run `cookiecutter /path/to/cloned/repo` ### Remotely (ie. using a git repo) - 1. Run `cookiecutter https://github.com/enovance/cookiecutter-openstack-puppet-modules.git` + 1. Run `cookiecutter https://github.com/openstack/puppet-openstack-cookiecutter.git` ## What's next -Once the boilerplate created, in order to be compliant with the other modules, the files managed by [msync](https://github.com/puppet-community/modulesync), (or [configs](https://github.com/stackforge/puppet-modulesync-configs)) needs to be in the project folder. Once synced module is ready, announce its existence to the ML, make the proper patch to openstack-infra and finally wait for the reviews to do the rest. +Once the boilerplate created, in order to be compliant with the other modules, the files managed by [msync](https://github.com/puppet-community/modulesync), (or [configs](https://github.com/openstack/puppet-modulesync-configs)) needs to be in the project folder. Once synced module is ready, announce its existence to the ML, make the proper patch to openstack-infra and finally wait for the reviews to do the rest. diff --git a/puppet-{{cookiecutter.project_name}}/.fixtures.yml b/puppet-{{cookiecutter.project_name}}/.fixtures.yml index 7775c32..637f213 100644 --- a/puppet-{{cookiecutter.project_name}}/.fixtures.yml +++ b/puppet-{{cookiecutter.project_name}}/.fixtures.yml @@ -4,9 +4,9 @@ fixtures: 'repo': 'git://github.com/puppetlabs/puppetlabs-concat.git' 'ref': '1.2.2' 'inifile': 'git://github.com/puppetlabs/puppetlabs-inifile' - 'keystone': 'git://github.com/stackforge/puppet-keystone.git' + 'keystone': 'git://github.com/openstack/puppet-keystone.git' 'mysql': 'git://github.com/puppetlabs/puppetlabs-mysql.git' - 'openstacklib': 'git://github.com/stackforge/puppet-openstacklib.git' + 'openstacklib': 'git://github.com/openstack/puppet-openstacklib.git' 'postgresql': 'git://github.com/puppetlabs/puppetlabs-postgresql.git' 'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib.git' symlinks: diff --git a/puppet-{{cookiecutter.project_name}}/.gitreview b/puppet-{{cookiecutter.project_name}}/.gitreview index 730af73..b86bc5a 100644 --- a/puppet-{{cookiecutter.project_name}}/.gitreview +++ b/puppet-{{cookiecutter.project_name}}/.gitreview @@ -1,4 +1,4 @@ [gerrit] host=review.openstack.org port=29418 -project=stackforge/puppet-{{cookiecutter.project_name}}.git +project=openstack/puppet-{{cookiecutter.project_name}}.git diff --git a/puppet-{{cookiecutter.project_name}}/CHANGELOG b/puppet-{{cookiecutter.project_name}}/CHANGELOG deleted file mode 100644 index 5ba4cf7..0000000 --- a/puppet-{{cookiecutter.project_name}}/CHANGELOG +++ /dev/null @@ -1,3 +0,0 @@ -YYYY-MM-DD Release 0.1.0 -- something you did -- something else you did diff --git a/puppet-{{cookiecutter.project_name}}/README.md b/puppet-{{cookiecutter.project_name}}/README.md index 65b9971..5d3aebf 100644 --- a/puppet-{{cookiecutter.project_name}}/README.md +++ b/puppet-{{cookiecutter.project_name}}/README.md @@ -14,7 +14,7 @@ Overview -------- -The {{cookiecutter.project_name}} module is a part of [Stackforge](https://github.com/stackfoge), an effort by the Openstack infrastructure team to provide continuous integration testing and code review for Openstack and Openstack community projects not part of the core software. The module its self is used to flexibly configure and manage the FIXME service for Openstack. +The {{cookiecutter.project_name}} module is a part of [OpenStack](https://github.com/openstack), an effort by the Openstack infrastructure team to provide continuous integration testing and code review for Openstack and Openstack community projects not part of the core software. The module its self is used to flexibly configure and manage the FIXME service for Openstack. Module Description ------------------ @@ -43,6 +43,7 @@ class { '{{cookiecutter.project_name}}': verbose => true, database_connection => 'mysql://{{cookiecutter.project_name}}_admin:super_secret_db_password@openstack-controller.example.com/{{cookiecutter.project_name}}', } +``` Implementation -------------- @@ -63,10 +64,10 @@ This module has beaker-rspec tests To run the tests on the default vagrant node: -``shell +```shell bundle install bundle exec rake acceptance -`` +``` For more information on writing and running beaker-rspec tests visit the documentation: @@ -82,4 +83,4 @@ Developer documentation for the entire puppet-openstack project. Contributors ------------ -* https://github.com/stackforge/puppet-{{cookiecutter.project_name}}/graphs/contributors +* https://github.com/openstack/puppet-{{cookiecutter.project_name}}/graphs/contributors diff --git a/puppet-{{cookiecutter.project_name}}/metadata.json b/puppet-{{cookiecutter.project_name}}/metadata.json index 9c37f92..bed6489 100644 --- a/puppet-{{cookiecutter.project_name}}/metadata.json +++ b/puppet-{{cookiecutter.project_name}}/metadata.json @@ -1,32 +1,33 @@ { "name": "puppet-{{cookiecutter.project_name}}", "version": "{{cookiecutter.version}}", - "author": "StackForge Contributors", + "author": "OpenStack Contributors", "summary": "Puppet module for OpenStack {{cookiecutter.project_name}}", "license": "Apache-2.0", - "source": "git://github.com/stackforge/puppet-{{cookiecutter.project_name}}.git", + "source": "git://github.com/openstack/puppet-{{cookiecutter.project_name}}.git", "project_page": "https://launchpad.net/puppet-{{cookiecutter.project_name}}", "issues_url": "https://bugs.launchpad.net/puppet-{{cookiecutter.project_name}}", "description": "Installs and configures OpenStack {{cookiecutter.project_name}}.", "operatingsystem_support": [ { "operatingsystem": "Debian", - "operatingsystemrelease": ["7"] + "operatingsystemrelease": ["8"] }, { "operatingsystem": "Fedora", - "operatingsystemrelease": ["20"] + "operatingsystemrelease": ["21","22"] }, { "operatingsystem": "RedHat", - "operatingsystemrelease": ["6.5","7"] + "operatingsystemrelease": ["7"] }, { "operatingsystem": "Ubuntu", - "operatingsystemrelease": ["12.04","14.04"] + "operatingsystemrelease": ["14.04"] } ], "dependencies": [ + { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" }, { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.0.0 <5.0.0" }, { "name": "stackforge/openstacklib", "version_requirement": ">=5.0.0 <6.0.0" } ] diff --git a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb index d3e6c94..883f095 100644 --- a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb +++ b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb @@ -15,7 +15,7 @@ describe '{{cookiecutter.project_name}}::logging' do :logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s', :log_config_append => '/etc/{{cookiecutter.project_name}}/logging.conf', :publish_errors => true, - :default_log_levels => { + :default_log_levels => { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',