summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Klare <j.klare@cloudbau.de>2017-08-29 10:29:09 +0200
committerJan Klare <j.klare@cloudbau.de>2017-08-29 10:29:09 +0200
commitf6f7f5f10fba2f385773ec005f88a978f5b9dc07 (patch)
tree5743133bd24a3a99b7239985aa2cafd38dfe47ba
parent2ee603dabe632273d0e68b9ce0ca1720a3b6143c (diff)
Cleanup for deployment and integration test
* removed direct links to official openstack-chef project, since this cookbook will incubate in the cloudbau namespace and maybe moved later to the official openstack/cookbook-* one * set version to 0.1.0 to avoid any assumed link to any official release ( 16.0.0 would be pike, but it might be also released with ocata or newton ) * removed version pinning for dependenies for incubation * cleaned up some attributes
-rw-r--r--CONTRIBUTING.md36
-rw-r--r--README.md4
-rw-r--r--attributes/default.rb12
-rw-r--r--metadata.rb10
4 files changed, 13 insertions, 49 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 7658369..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,36 +0,0 @@
1Contributing
2============
3
4How To Get Started
5------------------
6
7If you would like to contribute to the development of OpenStack Chef Cookbooks,
8you must follow the steps in this page:
9
10 https://docs.openstack.org/infra/manual/developers.html
11
12Gerrit Workflow
13---------------
14
15Once those steps have been completed, changes to OpenStack
16should be submitted for review via the Gerrit tool, following
17the workflow documented at:
18
19 https://docs.openstack.org/infra/manual/developers.html#development-workflow
20
21Pull requests submitted through GitHub will be ignored.
22
23Bugs
24----
25
26Bugs should be filed on Launchpad, not GitHub:
27
28 https://bugs.launchpad.net/openstack-chef
29
30Contacts
31--------
32
33Mailing list: openstack-dev@lists.openstack.org
34IRC: #openstack-chef is our channel on irc.freenode.net
35Wiki: https://wiki.openstack.org/wiki/Chef/GettingStarted and https://docs.getchef.com/openstack.html
36Twitter: @chefopenstack
diff --git a/README.md b/README.md
index 69a6fa5..b6eeef2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
1![Chef OpenStack Logo](https://www.openstack.org/themes/openstack/images/project-mascots/Chef%20OpenStack/OpenStack_Project_Chef_horizontal.png)
2
3Description 1Description
4=========== 2===========
5 3
@@ -63,8 +61,10 @@ License and Author
63| | | 61| | |
64|:---------------------|:---------------------------------------------------| 62|:---------------------|:---------------------------------------------------|
65| **Author** | Dr. Jens Harbott (<j.harbott@x-ion.de>) | 63| **Author** | Dr. Jens Harbott (<j.harbott@x-ion.de>) |
64| **Author** | Jan Klare (<j.klare@cloudbau.de>) |
66| | | 65| | |
67| **Copyright** | Copyright (c) 2017, x-ion GmbH. | 66| **Copyright** | Copyright (c) 2017, x-ion GmbH. |
67| **Copyright** | Copyright (c) 2017, cloudbau GmbH. |
68 68
69Licensed under the Apache License, Version 2.0 (the "License"); 69Licensed under the Apache License, Version 2.0 (the "License");
70you may not use this file except in compliance with the License. 70you 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 @@
4# Attributes:: default 4# Attributes:: default
5# 5#
6# Copyright 2017, x-ion GmbH 6# Copyright 2017, x-ion GmbH
7# Copyright 2017, cloudbau GmbH
8#
7# Licensed under the Apache License, Version 2.0 (the "License"); 9# Licensed under the Apache License, Version 2.0 (the "License");
8# you may not use this file except in compliance with the License. 10# you may not use this file except in compliance with the License.
9# You may obtain a copy of the License at 11# You may obtain a copy of the License at
@@ -49,20 +51,18 @@ default['openstack']['dns']['ec2authtoken']['auth']['version'] = 'v2.0'
49default['openstack']['dns']['api']['auth']['version'] = node['openstack']['api']['auth']['version'] 51default['openstack']['dns']['api']['auth']['version'] = node['openstack']['api']['auth']['version']
50 52
51# platform-specific settings 53# platform-specific settings
54default['openstack']['dns']['user'] = 'designate'
55default['openstack']['dns']['group'] = 'designate'
52case platform_family 56case platform_family
53# Note(jh): TBC 57 # Note(jh): TBC
54when 'rhel' 58when 'rhel'
55 default['openstack']['dns']['user'] = 'designate'
56 default['openstack']['dns']['group'] = 'designate'
57 default['openstack']['dns']['platform'] = { 59 default['openstack']['dns']['platform'] = {
58 'designate_common_packages' => ['openstack-designate'], 60 'designate_packages' => ['openstack-designate'],
59 'designate_api_service' => 'openstack-designate-api', 61 'designate_api_service' => 'openstack-designate-api',
60 'designate_central_service' => 'openstack-designate-central', 62 'designate_central_service' => 'openstack-designate-central',
61 'package_overrides' => '' 63 'package_overrides' => ''
62 } 64 }
63when 'debian' 65when 'debian'
64 default['openstack']['dns']['user'] = 'designate'
65 default['openstack']['dns']['group'] = 'designate'
66 default['openstack']['dns']['platform'] = { 66 default['openstack']['dns']['platform'] = {
67 'designate_packages' => ['designate'], 67 'designate_packages' => ['designate'],
68 'designate_api_service' => 'designate-api', 68 '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 @@
1# encoding: UTF-8 1# encoding: UTF-8
2name 'openstack-dns' 2name 'openstack-dns'
3maintainer 'openstack-chef' 3maintainer 'cloudbau GmbH'
4maintainer_email 'openstack-dev@lists.openstack.org' 4maintainer_email 'j.klare@cloudbau.de'
5issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url) 5issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
6source_url 'https://github.com/cloudbau/cookbook-openstack-dns' if respond_to?(:source_url) 6source_url 'https://github.com/cloudbau/cookbook-openstack-dns' if respond_to?(:source_url)
7license 'Apache 2.0' 7license 'Apache 2.0'
8description 'Installs and configures the Designate Service' 8description 'Installs and configures the Designate Service'
9long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) 9long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
10version '16.0.0' 10version '0.1.0'
11 11
12%w(ubuntu redhat centos).each do |os| 12%w(ubuntu redhat centos).each do |os|
13 supports os 13 supports os
14end 14end
15 15
16depends 'openstack-common', '>= 16.0.0' 16depends 'openstack-common'
17depends 'openstack-identity', '>= 16.0.0' 17depends 'openstack-identity'
18depends 'openstackclient' 18depends 'openstackclient'