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: If47b6b8c525c92a9421468e371c22f210b7f5e80
This commit is contained in:
parent
2a91191afd
commit
0b218495a9
11
Berksfile
11
Berksfile
|
@ -1,14 +1,11 @@
|
||||||
source 'https://supermarket.chef.io'
|
source 'https://supermarket.chef.io'
|
||||||
|
|
||||||
%w(common identity).each do |cookbook|
|
%w(-common -identity client).each do |cookbook|
|
||||||
if Dir.exist?("../cookbook-openstack-#{cookbook}")
|
if Dir.exist?("../cookbook-openstack#{cookbook}")
|
||||||
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
|
cookbook "openstack#{cookbook}", path: "../cookbook-openstack#{cookbook}"
|
||||||
else
|
else
|
||||||
cookbook "openstack-#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack-#{cookbook}"
|
cookbook "openstack#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack#{cookbook}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
cookbook 'openstackclient',
|
|
||||||
git: 'https://opendev.org/openstack/cookbook-openstackclient'
|
|
||||||
|
|
||||||
metadata
|
metadata
|
||||||
|
|
100
README.md
100
README.md
|
@ -1,100 +0,0 @@
|
||||||
Team and repository tags
|
|
||||||
========================
|
|
||||||
|
|
||||||
[![Team and repository tags](https://governance.openstack.org/badges/cookbook-openstack-orchestration.svg)](https://governance.openstack.org/reference/tags/index.html)
|
|
||||||
|
|
||||||
<!-- Change things from this point on -->
|
|
||||||
|
|
||||||
![Chef OpenStack Logo](https://www.openstack.org/themes/openstack/images/project-mascots/Chef%20OpenStack/OpenStack_Project_Chef_horizontal.png)
|
|
||||||
|
|
||||||
Description
|
|
||||||
===========
|
|
||||||
|
|
||||||
This cookbook installs the OpenStack Heat service **Heat** as part of an
|
|
||||||
OpenStack reference deployment Chef for OpenStack.
|
|
||||||
|
|
||||||
https://wiki.openstack.org/wiki/Heat
|
|
||||||
|
|
||||||
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', '>= 14.0.0'
|
|
||||||
- 'openstack-identity', '>= 14.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 heat.conf is decribed in the
|
|
||||||
openstack-common cookbook.
|
|
||||||
|
|
||||||
Recipes
|
|
||||||
=======
|
|
||||||
|
|
||||||
## openstack-orchestration::api-cfn
|
|
||||||
- Configure and start heat-api-cfn service
|
|
||||||
|
|
||||||
## openstack-orchestration::api
|
|
||||||
- Configure and start heat-api service
|
|
||||||
|
|
||||||
## openstack-orchestration::client
|
|
||||||
- Install the heat client packages
|
|
||||||
|
|
||||||
## openstack-orchestration::common
|
|
||||||
- Installs the heat packages and setup configuration for Heat.
|
|
||||||
|
|
||||||
## openstack-orchestration::engine
|
|
||||||
- Setup the heat database and start heat-engine service
|
|
||||||
|
|
||||||
## openstack-orchestration::identity_registration
|
|
||||||
- Registers the Heat API endpoint, heat service and user
|
|
||||||
|
|
||||||
License and Author
|
|
||||||
==================
|
|
||||||
|
|
||||||
| | |
|
|
||||||
|:---------------------|:---------------------------------------------------|
|
|
||||||
| **Author** | Zhao Fang Han (<hanzhf@cn.ibm.com>) |
|
|
||||||
| **Author** | Chen Zhiwei (<zhiwchen@cn.ibm.com>) |
|
|
||||||
| **Author** | Ionut Artarisi (<iartarisi@suse.cz>) |
|
|
||||||
| **Author** | Mark Vanderwiel (<vanderwl@us.ibm.com>) |
|
|
||||||
| **Author** | Jan Klare (<j.klare@x-ion.de>) |
|
|
||||||
| **Author** | Dr. Jens Rosenboom (<j.rosenboom@x-ion.de>) |
|
|
||||||
| **Author** | Christoph Albers (<c.albers@x-ion.de>) |
|
|
||||||
| | |
|
|
||||||
| **Copyright** | Copyright (c) 2013-2014, IBM Corp. |
|
|
||||||
| **Copyright** | Copyright (c) 2014, SUSE Linux, GmbH. |
|
|
||||||
| **Copyright** | Copyright (c) 2016, x-ion 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.
|
|
|
@ -0,0 +1,125 @@
|
||||||
|
OpenStack Chef Cookbook - orchestration
|
||||||
|
=======================================
|
||||||
|
|
||||||
|
.. image:: https://governance.openstack.org/badges/cookbook-openstack-orchestration.svg
|
||||||
|
:target: https://governance.openstack.org/reference/tags/index.html
|
||||||
|
|
||||||
|
Description
|
||||||
|
===========
|
||||||
|
|
||||||
|
This cookbook installs the OpenStack Heat service **Heat** 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. Heat is currently installed from
|
||||||
|
packages.
|
||||||
|
|
||||||
|
.. _OpenStack chef-repo: https://opendev.org/openstack/openstack-chef
|
||||||
|
|
||||||
|
https://docs.openstack.org/heat/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:
|
||||||
|
|
||||||
|
- 'openstack-common', '>= 18.0.0'
|
||||||
|
- 'openstack-identity', '>= 18.0.0'
|
||||||
|
- 'openstackclient'
|
||||||
|
|
||||||
|
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 ``heat.conf`` is described in
|
||||||
|
the openstack-common cookbook.
|
||||||
|
|
||||||
|
Recipes
|
||||||
|
=======
|
||||||
|
|
||||||
|
openstack-orchestration::api-cfn
|
||||||
|
--------------------------------
|
||||||
|
|
||||||
|
- Configure and start ``heat-api-cfn`` service
|
||||||
|
|
||||||
|
openstack-orchestration::api
|
||||||
|
----------------------------
|
||||||
|
|
||||||
|
- Configure and start ``heat-api`` service
|
||||||
|
|
||||||
|
openstack-orchestration::common
|
||||||
|
-------------------------------
|
||||||
|
|
||||||
|
- Installs the ``heat`` packages and setup configuration for Heat.
|
||||||
|
|
||||||
|
openstack-orchestration::engine
|
||||||
|
-------------------------------
|
||||||
|
|
||||||
|
- Setup the heat database and start ``heat-engine`` service
|
||||||
|
|
||||||
|
openstack-orchestration::identity_registration
|
||||||
|
----------------------------------------------
|
||||||
|
|
||||||
|
- Registers the Heat API endpoint, heat service and user
|
||||||
|
|
||||||
|
License and Author
|
||||||
|
==================
|
||||||
|
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Author** | Zhao Fang Han (hanzhf@cn.ibm.com) |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Author** | Chen Zhiwei (zhiwchen@cn.ibm.com) |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Author** | Ionut Artarisi (iartarisi@suse.cz) |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Author** | Mark Vanderwiel (vanderwl@us.ibm.com) |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Author** | Jan Klare (j.klare@x-ion.de) |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Author** | Dr. Jens Rosenboom (j.rosenboom@x-ion.de) |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Author** | Christoph Albers (c.albers@x-ion.de) |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Author** | Lance Albertson (lance@osuosl.org) |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Copyright** | Copyright (c) 2013-2014, IBM Corp. |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Copyright** | Copyright (c) 2014, SUSE Linux, GmbH. |
|
||||||
|
+-----------------+---------------------------------------------+
|
||||||
|
| **Copyright** | Copyright (c) 2016, x-ion 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.
|
2
Rakefile
2
Rakefile
|
@ -33,7 +33,7 @@ end
|
||||||
desc 'All-in-One Neutron build Infra using Common task'
|
desc 'All-in-One Neutron build Infra using Common task'
|
||||||
task :integration do
|
task :integration do
|
||||||
# Use the common integration task
|
# 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 Rakefile-Common https://opendev.org/openstack/cookbook-openstack-common/raw/branch/master/Rakefile)
|
||||||
load './Rakefile-Common'
|
load './Rakefile-Common'
|
||||||
Rake::Task['common_integration'].invoke
|
Rake::Task['common_integration'].invoke
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
#!/bin/bash -x
|
|
||||||
## This script is for installing all the needed packages on trusty 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
|
|
15
metadata.rb
15
metadata.rb
|
@ -3,17 +3,22 @@ maintainer 'openstack-chef'
|
||||||
maintainer_email 'openstack-discuss@lists.openstack.org'
|
maintainer_email 'openstack-discuss@lists.openstack.org'
|
||||||
license 'Apache-2.0'
|
license 'Apache-2.0'
|
||||||
description 'Installs and configures the Heat Service'
|
description 'Installs and configures the Heat Service'
|
||||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
|
||||||
version '18.0.0'
|
version '18.0.0'
|
||||||
|
|
||||||
|
recipe 'openstack-orchestration::api-cfn', 'Configure and start heat-api-cfn service'
|
||||||
|
recipe 'openstack-orchestration::api', 'Configure and start heat-api service'
|
||||||
|
recipe 'openstack-orchestration::common', 'Installs the heat packages and setup configuration for Heat.'
|
||||||
|
recipe 'openstack-orchestration::engine', 'Setup the heat database and start heat-engine service'
|
||||||
|
recipe 'openstack-orchestration::identity_registration', 'Registers the Heat API endpoint, heat service and user'
|
||||||
|
|
||||||
%w(ubuntu redhat centos).each do |os|
|
%w(ubuntu redhat centos).each do |os|
|
||||||
supports os
|
supports os
|
||||||
end
|
end
|
||||||
|
|
||||||
|
depends 'openstackclient'
|
||||||
depends 'openstack-common', '>= 18.0.0'
|
depends 'openstack-common', '>= 18.0.0'
|
||||||
depends 'openstack-identity', '>= 18.0.0'
|
depends 'openstack-identity', '>= 18.0.0'
|
||||||
depends 'openstackclient'
|
|
||||||
|
|
||||||
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
|
issues_url 'https://launchpad.net/openstack-chef'
|
||||||
source_url 'https://github.com/openstack/cookbook-openstack-orchestration' if respond_to?(:source_url)
|
source_url 'https://opendev.org/openstack/cookbook-openstack-orchestration'
|
||||||
chef_version '>= 12.5' if respond_to?(:chef_version)
|
chef_version '>= 14.0'
|
||||||
|
|
Loading…
Reference in New Issue