Updates for rocky

- Replace git.openstack.org with opendev.org
- Update some documentation
- Move README.md to README.rst for better rendering
- Drop obsolete bootstrap.sh script

Change-Id: I09b1c971476c6034dd2cfb656545629305a35912
This commit is contained in:
Lance Albertson 2019-12-05 17:05:39 -08:00
parent b83f37fde1
commit cc4ec95267
6 changed files with 163 additions and 102 deletions

View File

@ -1,10 +1,11 @@
source 'https://supermarket.chef.io'
metadata
%w(-common -identity client).each do |cookbook|
if Dir.exist?("../cookbook-openstack#{cookbook}")
cookbook "openstack#{cookbook}", path: "../cookbook-openstack#{cookbook}"
else
cookbook "openstack#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack#{cookbook}"
end
end
cookbook 'openstack-identity',
github: 'openstack/cookbook-openstack-identity'
cookbook 'openstack-common',
github: 'openstack/cookbook-openstack-common'
cookbook 'openstackclient',
git: 'https://git.openstack.org/openstack/cookbook-openstackclient'
metadata

View File

@ -1,79 +0,0 @@
Description
===========
This cookbook installs the OpenStack DNS service **Designate** as part of an
OpenStack reference deployment Chef for OpenStack.
https://docs.openstack.org/designate
Requirements
============
- Chef 12 or higher
- chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook
dependency resolution)
Platform
========
- ubuntu
- redhat
- centos
Cookbooks
=========
The following cookbooks are dependencies:
- 'openstack-common', '>= 16.0.0'
- 'openstack-identity', '>= 16.0.0'
- 'openstackclient', '>= 0.1.0'
Attributes
==========
Please see the extensive inline documentation in `attributes/*.rb` for
descriptions of all the settable attributes for this cookbook.
Note that all attributes are in the `default['openstack']` "namespace"
The usage of attributes to generate the designate.conf is described in the
openstack-common cookbook.
Recipes
=======
## openstack-dns::api
- Configure and start designate-api service
## openstack-dns::client
- Install the designate client package
## openstack-dns::common
- Installs the designate packages and setup configuration for Designate.
## openstack-dns::identity_registration
- Registers the Designate API endpoint, designate service and user
License and Author
==================
| | |
|:---------------------|:---------------------------------------------------|
| **Author** | Dr. Jens Harbott (<j.harbott@x-ion.de>) |
| **Author** | Jan Klare (<j.klare@cloudbau.de>) |
| | |
| **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.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

138
README.rst Normal file
View File

@ -0,0 +1,138 @@
OpenStack Chef Cookbook - dns
=============================
.. image:: https://governance.openstack.org/badges/cookbook-openstack-dns.svg
:target: https://governance.openstack.org/reference/tags/index.html
Description
===========
This cookbook installs the OpenStack DNS service **Designate** as part
of an OpenStack reference deployment Chef for OpenStack. The `OpenStack
chef-repo`_ contains documentation for using this cookbook in the
context of a full OpenStack deployment. Designate is currently installed
from packages.
.. _OpenStack chef-repo: https://opendev.org/openstack/openstack-chef
https://docs.openstack.org/designate/latest/
Requirements
============
- Chef 14 or higher
- ChefDK 3.2.30 for testing (also includes Berkshelf for cookbook
dependency resolution)
Platform
========
- ubuntu
- redhat
- centos
Cookbooks
=========
The following cookbooks are dependencies:
- 'openstackclient'
- 'openstack-common', '>= 18.0.0'
- 'openstack-identity', '>= 18.0.0'
Attributes
==========
Please see the extensive inline documentation in ``attributes/*.rb`` for
descriptions of all the settable attributes for this cookbook.
Note that all attributes are in the ``default['openstack']`` "namespace"
The usage of attributes to generate the ``designate.conf`` is described
in the openstack-common cookbook.
Recipes
=======
openstack-dns::api
------------------
- Configure and start designate-api service
openstack-dns::central
----------------------
- Starts and enables the designate-central service
openstack-dns::common
---------------------
- Installs the designate packages and setup configuration for Designate.
openstack-dns::dashboard
------------------------
- Installs the designate dashboard packages.
openstack-dns::identity_registration
------------------------------------
- Registers the Designate API endpoint, designate service and user
openstack-dns::mdns
-------------------
- Starts and enables the designate-mdns service
openstack-dns::neutron_int
--------------------------
- Configure the neutron external dns driver
openstack-dns::producer
-----------------------
- Starts and enables the designate-producer service
openstack-dns::sink
-------------------
- Starts and enables the designate-sink service
openstack-dns::worker
---------------------
- Starts and enables the designate-worker service
License and Author
==================
+-----------------+-----------------------------------------+
| **Author** | Dr. Jens Harbott (j.harbott@x-ion.de) |
+-----------------+-----------------------------------------+
| **Author** | Jan Klare (j.klare@cloudbau.de) |
+-----------------+-----------------------------------------+
| **Author** | Lance Albertson (lance@osuosl.org) |
+-----------------+-----------------------------------------+
+-----------------+---------------------------------------------+
| **Copyright** | Copyright (c) 2017-2019, x-ion GmbH. |
+-----------------+---------------------------------------------+
| **Copyright** | Copyright (c) 2017, cloudbau GmbH. |
+-----------------+---------------------------------------------+
| **Copyright** | Copyright (c) 2019, Oregon State University |
+-----------------+---------------------------------------------+
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
::
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@ -33,7 +33,7 @@ end
desc 'All-in-One Neutron build Infra using Common task'
task :integration do
# Use the common integration task
sh %(wget -nv -t 3 -O Rakefile-Common https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/Rakefile)
sh %(wget -nv -t 3 -O https://opendev.org/openstack/cookbook-openstack-common/raw/branch/master/Rakefile)
load './Rakefile-Common'
Rake::Task['common_integration'].invoke
end

View File

@ -1,9 +0,0 @@
#!/bin/bash -x
## This script is for installing all the needed packages on xenial to run the chef tests with 'chef exec rake'.
## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies.
curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh \
--retry 3 \
--silent \
--show-error \
| /bin/bash -x

View File

@ -2,18 +2,28 @@
name 'openstack-dns'
maintainer 'openstack-chef'
maintainer_email 'openstack-discuss@lists.openstack.org'
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
source_url 'https://git.openstack.org/openstack/cookbook-openstack-dns' if respond_to?(:source_url)
issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-dns'
license 'Apache-2.0'
description 'Installs and configures the Designate Service'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
chef_version '>= 12.5' if respond_to?(:chef_version)
chef_version '>= 14.0'
version '18.0.0'
recipe 'api', 'Configure and start designate-api service'
recipe 'central', 'Starts and enables the designate-central service'
recipe 'common', 'Installs the designate packages and setup configuration for Designate.'
recipe 'dashboard', 'Installs the designate dashboard packages.'
recipe 'identity_registration', 'Registers the Designate API endpoint, designate service and user'
recipe 'mdns', 'Starts and enables the designate-mdns service'
recipe 'neutron_int', 'Configure the neutron external dns driver'
recipe 'producer', 'Starts and enables the designate-producer service'
recipe 'sink', 'Starts and enables the designate-sink service'
recipe 'worker', 'Starts and enables the designate-worker service'
%w(ubuntu redhat centos).each do |os|
supports os
end
depends 'openstack-common'
depends 'openstack-identity'
depends 'openstack-common', '>= 18.0.0'
depends 'openstack-identity', '>= 18.0.0'
depends 'openstackclient'