diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 7658369..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,36 +0,0 @@ -Contributing -============ - -How To Get Started ------------------- - -If you would like to contribute to the development of OpenStack Chef Cookbooks, -you must follow the steps in this page: - - https://docs.openstack.org/infra/manual/developers.html - -Gerrit Workflow ---------------- - -Once those steps have been completed, changes to OpenStack -should be submitted for review via the Gerrit tool, following -the workflow documented at: - - https://docs.openstack.org/infra/manual/developers.html#development-workflow - -Pull requests submitted through GitHub will be ignored. - -Bugs ----- - -Bugs should be filed on Launchpad, not GitHub: - - https://bugs.launchpad.net/openstack-chef - -Contacts --------- - -Mailing list: openstack-dev@lists.openstack.org -IRC: #openstack-chef is our channel on irc.freenode.net -Wiki: https://wiki.openstack.org/wiki/Chef/GettingStarted and https://docs.getchef.com/openstack.html -Twitter: @chefopenstack diff --git a/README.md b/README.md index 69a6fa5..b6eeef2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -![Chef OpenStack Logo](https://www.openstack.org/themes/openstack/images/project-mascots/Chef%20OpenStack/OpenStack_Project_Chef_horizontal.png) - Description =========== @@ -63,8 +61,10 @@ License and Author | | | |:---------------------|:---------------------------------------------------| | **Author** | Dr. Jens Harbott () | +| **Author** | Jan Klare () | | | | | **Copyright** | Copyright (c) 2017, x-ion GmbH. | +| **Copyright** | Copyright (c) 2017, cloudbau GmbH. | Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/attributes/default.rb b/attributes/default.rb index 52528ec..967c090 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -4,6 +4,8 @@ # Attributes:: default # # Copyright 2017, x-ion GmbH +# Copyright 2017, cloudbau GmbH +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -49,20 +51,18 @@ default['openstack']['dns']['ec2authtoken']['auth']['version'] = 'v2.0' default['openstack']['dns']['api']['auth']['version'] = node['openstack']['api']['auth']['version'] # platform-specific settings +default['openstack']['dns']['user'] = 'designate' +default['openstack']['dns']['group'] = 'designate' case platform_family -# Note(jh): TBC + # Note(jh): TBC when 'rhel' - default['openstack']['dns']['user'] = 'designate' - default['openstack']['dns']['group'] = 'designate' default['openstack']['dns']['platform'] = { - 'designate_common_packages' => ['openstack-designate'], + 'designate_packages' => ['openstack-designate'], 'designate_api_service' => 'openstack-designate-api', 'designate_central_service' => 'openstack-designate-central', 'package_overrides' => '' } when 'debian' - default['openstack']['dns']['user'] = 'designate' - default['openstack']['dns']['group'] = 'designate' default['openstack']['dns']['platform'] = { 'designate_packages' => ['designate'], 'designate_api_service' => 'designate-api', diff --git a/metadata.rb b/metadata.rb index 9cf98eb..3940d54 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,18 +1,18 @@ # encoding: UTF-8 name 'openstack-dns' -maintainer 'openstack-chef' -maintainer_email 'openstack-dev@lists.openstack.org' +maintainer 'cloudbau GmbH' +maintainer_email 'j.klare@cloudbau.de' issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url) source_url 'https://github.com/cloudbau/cookbook-openstack-dns' if respond_to?(:source_url) license 'Apache 2.0' description 'Installs and configures the Designate Service' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '16.0.0' +version '0.1.0' %w(ubuntu redhat centos).each do |os| supports os end -depends 'openstack-common', '>= 16.0.0' -depends 'openstack-identity', '>= 16.0.0' +depends 'openstack-common' +depends 'openstack-identity' depends 'openstackclient'