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: If94bd0673690681837f25d76fa28139406945e71
This commit is contained in:
Lance Albertson
parent
3923f6ff5c
commit
59189b5bed
11
Berksfile
11
Berksfile
|
|
@ -1,14 +1,11 @@
|
|||
source 'https://supermarket.chef.io'
|
||||
|
||||
%w(common compute identity image network).each do |cookbook|
|
||||
if Dir.exist?("../cookbook-openstack-#{cookbook}")
|
||||
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
|
||||
%w(-common -compute -identity -image -network client).each do |cookbook|
|
||||
if Dir.exist?("../cookbook-openstack#{cookbook}")
|
||||
cookbook "openstack#{cookbook}", path: "../cookbook-openstack#{cookbook}"
|
||||
else
|
||||
cookbook "openstack-#{cookbook}", git: "https://git.openstack.org/openstack/cookbook-openstack-#{cookbook}"
|
||||
cookbook "openstack#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack#{cookbook}"
|
||||
end
|
||||
end
|
||||
|
||||
cookbook 'openstackclient',
|
||||
git: 'https://git.openstack.org/openstack/cookbook-openstackclient'
|
||||
|
||||
metadata
|
||||
|
|
|
|||
122
README.md
122
README.md
|
|
@ -1,122 +0,0 @@
|
|||
Team and repository tags
|
||||
========================
|
||||
|
||||
[](http://governance.openstack.org/reference/tags/index.html)
|
||||
|
||||
<!-- Change things from this point on -->
|
||||
|
||||
|
||||
|
||||
Description
|
||||
===========
|
||||
|
||||
Installs the OpenStack Metering service **Ceilometer** as well as **Gnocchi** as
|
||||
the backend for Metrics as part of the OpenStack reference deployment Chef for
|
||||
OpenStack. Both are currently installed from packages.
|
||||
|
||||
https://docs.openstack.org/ceilometer/latest/
|
||||
https://gnocchi.xyz/
|
||||
|
||||
Requirements
|
||||
============
|
||||
|
||||
- Chef 12 or higher
|
||||
- chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook
|
||||
dependency resolution)
|
||||
|
||||
WARNING:
|
||||
- Currently there are no gnocchi packages included for Ubuntu Trusty. The
|
||||
gnocchi recipe will only work on Ubuntu Xenial and above.
|
||||
|
||||
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 node.conf is decribed in the
|
||||
openstack-common cookbook.
|
||||
|
||||
Recipes
|
||||
=======
|
||||
|
||||
## agent-central
|
||||
- Installs agent central service.
|
||||
|
||||
## agent-compute
|
||||
- Installs agent compute service.
|
||||
|
||||
## agent-notification
|
||||
- Installs agent notification service.
|
||||
|
||||
## client
|
||||
- Install the client packages
|
||||
|
||||
## collector
|
||||
- Installs collector package and service. If the NoSQL database is used for metering service, ceilometer-upgrade will not be executed.
|
||||
|
||||
## common
|
||||
- Common metering configuration.
|
||||
|
||||
## setup
|
||||
- Run database migrations
|
||||
|
||||
## identity_registration
|
||||
- Registers the endpoints, tenant and user for metering and metric service with Keystone.
|
||||
|
||||
## gnocchi
|
||||
- Installs gnochhi as default backend for ceilometer metrics
|
||||
|
||||
License and Author
|
||||
==================
|
||||
|
||||
| | |
|
||||
|:---------------------|:---------------------------------------------------|
|
||||
| **Author** | Matt Ray (<matt@opscode.com>) |
|
||||
| **Author** | John Dewey (<jdewey@att.com>) |
|
||||
| **Author** | Justin Shepherd (<jshepher@rackspace.com>) |
|
||||
| **Author** | Salman Baset (<sabaset@us.ibm.com>) |
|
||||
| **Author** | Ionut Artarisi (<iartarisi@suse.cz>) |
|
||||
| **Author** | Eric Zhou (<zyouzhou@cn.ibm.com>) |
|
||||
| **Author** | Chen Zhiwei (<zhiwchen@cn.ibm.com>) |
|
||||
| **Author** | David Geng (<gengjh@cn.ibm.com>) |
|
||||
| **Author** | Mark Vanderwiel (<vanderwl@us.ibm.com>) |
|
||||
| **Author** | Jan Klare (<j.klare@cloudbau.de>) |
|
||||
| **Author** | Christoph Albers (<c.albers@x-ion.de>) |
|
||||
| | |
|
||||
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
|
||||
| **Copyright** | Copyright (c) 2013, AT&T Services, Inc. |
|
||||
| **Copyright** | Copyright (c) 2013, Rackspace US, Inc. |
|
||||
| **Copyright** | Copyright (c) 2013-2014, IBM, Corp. |
|
||||
| **Copyright** | Copyright (c) 2013-2014, SUSE Linux 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
|
||||
|
||||
http://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,166 @@
|
|||
OpenStack Chef Cookbook - telemetry
|
||||
===================================
|
||||
|
||||
.. image:: https://governance.openstack.org/badges/cookbook-openstack-telemetry.svg
|
||||
:target: https://governance.openstack.org/reference/tags/index.html
|
||||
|
||||
Description
|
||||
===========
|
||||
|
||||
Installs the OpenStack Metering service **Ceilometer** as well as
|
||||
**Gnocchi** as the backend for Metrics as part of the OpenStack
|
||||
reference deployment Chef for OpenStack. The `OpenStack chef-repo`_
|
||||
contains documentation for using this cookbook in the context of a full
|
||||
OpenStack deployment. Both are currently installed from packages.
|
||||
|
||||
.. _OpenStack chef-repo: https://opendev.org/openstack/openstack-chef
|
||||
|
||||
https://docs.openstack.org/ceilometer/latest/
|
||||
|
||||
https://gnocchi.xyz/
|
||||
|
||||
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', '>= 0.1.0'
|
||||
- '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 ``ceilometer.conf`` and
|
||||
``gnocchi`` is described in the openstack-common cookbook.
|
||||
|
||||
Recipes
|
||||
=======
|
||||
|
||||
agent-central
|
||||
-------------
|
||||
|
||||
- Installs agent central service.
|
||||
|
||||
agent-compute
|
||||
-------------
|
||||
|
||||
- Installs agent compute service.
|
||||
|
||||
agent-notification
|
||||
------------------
|
||||
|
||||
- Installs agent notification service.
|
||||
|
||||
aodh
|
||||
----
|
||||
|
||||
- Installs aodh service
|
||||
|
||||
collector
|
||||
---------
|
||||
|
||||
- Installs collector package and service. If the NoSQL database is used
|
||||
for metering service, ``ceilometer-upgrade`` will not be executed.
|
||||
|
||||
common
|
||||
------
|
||||
|
||||
- Common metering configuration.
|
||||
|
||||
gnocchi_configure
|
||||
-----------------
|
||||
|
||||
- Configure Gnocchi
|
||||
|
||||
gnocchi_install
|
||||
---------------
|
||||
|
||||
- Installs and starts the Gnocchi service
|
||||
|
||||
identity_registration
|
||||
---------------------
|
||||
|
||||
- Registers the endpoints, tenant and user for metering and metric
|
||||
service with Keystone.
|
||||
|
||||
setup
|
||||
-----
|
||||
|
||||
- Run database migrations
|
||||
|
||||
License and Author
|
||||
==================
|
||||
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Matt Ray (matt@opscode.com) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | John Dewey (jdewey@att.com) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Justin Shepherd (jshepher@rackspace.com) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Salman Baset (sabaset@us.ibm.com) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Ionut Artarisi (iartarisi@suse.cz) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Eric Zhou (zyouzhou@cn.ibm.com) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Chen Zhiwei (zhiwchen@cn.ibm.com) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | David Geng (gengjh@cn.ibm.com) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Mark Vanderwiel (vanderwl@us.ibm.com) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Jan Klare (j.klare@cloudbau.de) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Christoph Albers (c.albers@x-ion.de) |
|
||||
+-----------------+--------------------------------------------+
|
||||
| **Author** | Lance Albertson (lance@osuosl.org |
|
||||
+-----------------+--------------------------------------------+
|
||||
|
||||
+-----------------+---------------------------------------------+
|
||||
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
|
||||
+-----------------+---------------------------------------------+
|
||||
| **Copyright** | Copyright (c) 2013, AT&T Services, Inc. |
|
||||
+-----------------+---------------------------------------------+
|
||||
| **Copyright** | Copyright (c) 2013, Rackspace US, Inc. |
|
||||
+-----------------+---------------------------------------------+
|
||||
| **Copyright** | Copyright (c) 2013-2014, IBM, Corp. |
|
||||
+-----------------+---------------------------------------------+
|
||||
| **Copyright** | Copyright (c) 2013-2014, SUSE Linux 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
|
||||
|
||||
::
|
||||
|
||||
http://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'
|
||||
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 Rakefile-Common https://opendev.org/openstack/cookbook-openstack-common/raw/branch/master/Rakefile)
|
||||
load './Rakefile-Common'
|
||||
Rake::Task['common_integration'].invoke
|
||||
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
|
||||
18
metadata.rb
18
metadata.rb
|
|
@ -3,30 +3,28 @@ maintainer 'openstack-chef'
|
|||
maintainer_email 'openstack-discuss@lists.openstack.org'
|
||||
license 'Apache-2.0'
|
||||
description 'The OpenStack Metering service Ceilometer.'
|
||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||
version '18.0.0'
|
||||
|
||||
recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
|
||||
recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
|
||||
recipe 'openstack-telemetry::agent-notification', 'Installs the agent notification service.'
|
||||
recipe 'openstack-telemetry::aodh', 'Installs aodh service'
|
||||
recipe 'openstack-telemetry::api', 'Installs API service.'
|
||||
recipe 'openstack-telemetry::client', 'Installs client.'
|
||||
recipe 'openstack-telemetry::collector', 'Installs collector service. If the NoSQL database is used for metering service, ceilometer-upgrade will not be executed.'
|
||||
recipe 'openstack-telemetry::alarm-evaluator', 'Installs the alarm evaluator service.'
|
||||
recipe 'openstack-telemetry::alarm-notifier', 'Installs the alarm notifier service.'
|
||||
recipe 'openstack-telemetry::common', 'Common metering configuration.'
|
||||
recipe 'openstack-telemetry::gnocchi_configure', 'Configure Gnocchi'
|
||||
recipe 'openstack-telemetry::gnocchi_install', 'Installs and starts the Gnocchi service'
|
||||
recipe 'openstack-telemetry::identity_registration', 'Registers the endpoints, tenant and user for metering service with Keystone'
|
||||
|
||||
%w(ubuntu redhat centos).each do |os|
|
||||
supports os
|
||||
end
|
||||
|
||||
depends 'apache2'
|
||||
depends 'openstackclient'
|
||||
depends 'openstack-common', '>= 18.0.0'
|
||||
depends 'openstack-identity', '>= 18.0.0'
|
||||
depends 'openstackclient'
|
||||
|
||||
depends 'apache2'
|
||||
|
||||
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
|
||||
source_url 'https://github.com/openstack/cookbook-openstack-telemetry' if respond_to?(:source_url)
|
||||
chef_version '>= 12.5' if respond_to?(:chef_version)
|
||||
issues_url 'https://launchpad.net/openstack-chef'
|
||||
source_url 'https://opendev.org/openstack/cookbook-openstack-telemetry'
|
||||
chef_version '>= 14.0'
|
||||
|
|
|
|||
Loading…
Reference in New Issue