Rename openstack-metering to openstack-telemetry

update cookbook name, attribute name

Change-Id: Ibd17a61b06769ed03e87bdcf54f394e67fce5bcb
This commit is contained in:
Chen Zhiwei 2014-03-12 23:47:26 -04:00
parent a95069cf33
commit c74a5400b7
31 changed files with 165 additions and 161 deletions

View File

@ -1,7 +1,10 @@
openstack-metering Cookbook CHANGELOG
openstack-telemetry Cookbook CHANGELG
==============================
This file is used to list changes made in each version of the openstack-metering cookbook.
## 8.3.0
* Rename openstack-metering to openstack-telemetry
## 8.2.0
### Blueprint
* Add NoSQL support for metering.

View File

@ -72,12 +72,13 @@ License and Author
| **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** | Eric Zhou (<zyouzhou@cn.ibm.com>) |
| **Author** | Chen Zhiwei (<zhiwchen@cn.ibm.com>) |
| | |
| **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, IBM Corp. |
| **Copyright** | Copyright (c) 2013-2014, IBM, Corp. |
| **Copyright** | Copyright (c) 2013, SUSE Linux GmbH |

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-metering
# Cookbook Name:: openstack-telemetry
# Recipe:: default
#
# Copyright 2013, AT&T Services, Inc.
@ -21,28 +21,28 @@
# The name of the Chef role that knows about the message queue server
# that Nova uses
default['openstack']['metering']['rabbit_server_chef_role'] = 'os-ops-messaging'
default['openstack']['telemetry']['rabbit_server_chef_role'] = 'os-ops-messaging'
default['openstack']['metering']['conf_dir'] = '/etc/ceilometer'
default['openstack']['metering']['conf'] = ::File.join(node['openstack']['metering']['conf_dir'], 'ceilometer.conf')
default['openstack']['metering']['periodic_interval'] = 600
default['openstack']['metering']['syslog']['use'] = false
default['openstack']['metering']['verbose'] = 'true'
default['openstack']['metering']['debug'] = 'false'
default['openstack']['telemetry']['conf_dir'] = '/etc/ceilometer'
default['openstack']['telemetry']['conf'] = ::File.join(node['openstack']['telemetry']['conf_dir'], 'ceilometer.conf')
default['openstack']['telemetry']['periodic_interval'] = 600
default['openstack']['telemetry']['syslog']['use'] = false
default['openstack']['telemetry']['verbose'] = 'true'
default['openstack']['telemetry']['debug'] = 'false'
default['openstack']['metering']['api']['auth']['cache_dir'] = '/var/cache/ceilometer/api'
default['openstack']['telemetry']['api']['auth']['cache_dir'] = '/var/cache/ceilometer/api'
default['openstack']['metering']['user'] = 'ceilometer'
default['openstack']['metering']['group'] = 'ceilometer'
default['openstack']['telemetry']['user'] = 'ceilometer'
default['openstack']['telemetry']['group'] = 'ceilometer'
default['openstack']['metering']['region'] = node['openstack']['region']
default['openstack']['metering']['service_user'] = 'ceilometer'
default['openstack']['metering']['service_tenant_name'] = 'service'
default['openstack']['metering']['service_role'] = 'admin'
default['openstack']['telemetry']['region'] = node['openstack']['region']
default['openstack']['telemetry']['service_user'] = 'ceilometer'
default['openstack']['telemetry']['service_tenant_name'] = 'service'
default['openstack']['telemetry']['service_role'] = 'admin'
case platform
when 'suse' # :pragma-foodcritic: ~FC024 - won't fix this
default['openstack']['metering']['platform'] = {
default['openstack']['telemetry']['platform'] = {
'common_packages' => ['openstack-ceilometer'],
'agent_central_packages' => ['openstack-ceilometer-agent-central'],
'agent_central_service' => 'openstack-ceilometer-agent-central',
@ -55,7 +55,7 @@ when 'suse' # :pragma-foodcritic: ~FC024 - won't fix this
'collector_service' => 'openstack-ceilometer-collector'
}
when 'fedora', 'redhat', 'centos'
default['openstack']['metering']['platform'] = {
default['openstack']['telemetry']['platform'] = {
'common_packages' => ['openstack-ceilometer-common'],
'agent_central_packages' => ['openstack-ceilometer-central'],
'agent_central_service' => 'openstack-ceilometer-central',
@ -69,7 +69,7 @@ when 'fedora', 'redhat', 'centos'
}
when 'ubuntu'
default['openstack']['metering']['platform'] = {
default['openstack']['telemetry']['platform'] = {
'common_packages' => ['ceilometer-common'],
'agent_central_packages' => ['ceilometer-agent-central'],
'agent_central_service' => 'ceilometer-agent-central',

View File

@ -1,18 +1,18 @@
name 'openstack-metering'
name 'openstack-telemetry'
maintainer 'AT&T Services, Inc.'
maintainer_email 'cookbooks@lists.tfoundry.com'
license 'Apache 2.0'
description 'The OpenStack Metering service Ceilometer.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '8.2.0'
version '8.3.0'
recipe 'openstack-metering::agent-central', 'Installs agent central service.'
recipe 'openstack-metering::agent-compute', 'Installs agent compute service.'
recipe 'openstack-metering::api', 'Installs API service.'
recipe 'openstack-metering::client', 'Installs client.'
recipe 'openstack-metering::collector', 'Installs collector service. If the NoSQL database is used for metering service, ceilometer-dbsync will not be executed.'
recipe 'openstack-metering::common', 'Common metering configuration.'
recipe 'openstack-metering::identity_registration', 'Registers the endpoints, tenant and user for metering service with Keystone'
recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
recipe 'openstack-telemetry::agent-compute', 'Installs agent compute 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-dbsync will not be executed.'
recipe 'openstack-telemetry::common', 'Common metering configuration.'
recipe 'openstack-telemetry::identity_registration', 'Registers the endpoints, tenant and user for metering service with Keystone'
%w{ ubuntu suse }.each do |os|
supports os

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-metering
# Cookbook Name:: openstack-telemetry
# Recipe:: agent-central
#
# Copyright 2013, AT&T Services, Inc.
@ -19,9 +19,9 @@
# limitations under the License.
#
include_recipe 'openstack-metering::common'
include_recipe 'openstack-telemetry::common'
platform = node['openstack']['metering']['platform']
platform = node['openstack']['telemetry']['platform']
platform['agent_central_packages'].each do |pkg|
package pkg
end

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-metering
# Cookbook Name:: openstack-telemetry
# Recipe:: agent-compute
#
# Copyright 2013, AT&T Services, Inc.
@ -19,9 +19,9 @@
# limitations under the License.
#
include_recipe 'openstack-metering::common'
include_recipe 'openstack-telemetry::common'
platform = node['openstack']['metering']['platform']
platform = node['openstack']['telemetry']['platform']
platform['agent_compute_packages'].each do |pkg|
package pkg
end

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-metering
# Cookbook Name:: openstack-telemetry
# Recipe:: api
#
# Copyright 2013, AT&T Services, Inc.
@ -20,15 +20,15 @@
# limitations under the License.
#
include_recipe 'openstack-metering::common'
include_recipe 'openstack-telemetry::common'
directory ::File.dirname(node['openstack']['metering']['api']['auth']['cache_dir']) do
owner node['openstack']['metering']['user']
group node['openstack']['metering']['group']
directory ::File.dirname(node['openstack']['telemetry']['api']['auth']['cache_dir']) do
owner node['openstack']['telemetry']['user']
group node['openstack']['telemetry']['group']
mode 00700
end
platform = node['openstack']['metering']['platform']
platform = node['openstack']['telemetry']['platform']
platform['api_packages'].each do |pkg|
package pkg
end

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-metering
# Cookbook Name:: openstack-telemetry
# Recipe:: client
#
# Copyright 2014, IBM Corp.
@ -22,7 +22,7 @@ class ::Chef::Recipe # rubocop:disable Documentation
include ::Openstack
end
platform_options = node['openstack']['metering']['platform']
platform_options = node['openstack']['telemetry']['platform']
platform_options['client_packages'].each do |pkg|
package pkg do
options platform_options['package_overrides']

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-metering
# Cookbook Name:: openstack-telemetry
# Recipe:: collector
#
# Copyright 2013, AT&T Services, Inc.
@ -20,17 +20,17 @@
# limitations under the License.
#
include_recipe 'openstack-metering::common'
include_recipe 'openstack-telemetry::common'
conf_switch = "--config-file #{node["openstack"]["metering"]["conf"]}"
conf_switch = "--config-file #{node["openstack"]["telemetry"]["conf"]}"
unless node['openstack']['db']['metering']['nosql']['used']
unless node['openstack']['db']['telemetry']['nosql']['used']
execute 'database migration' do
command "ceilometer-dbsync #{conf_switch}"
end
end
platform = node['openstack']['metering']['platform']
platform = node['openstack']['telemetry']['platform']
platform['collector_packages'].each do |pkg|
package pkg
end

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-metering
# Cookbook Name:: openstack-telemetry
# Recipe:: common
#
# Copyright 2013, AT&T Services, Inc.
@ -24,51 +24,51 @@ class ::Chef::Recipe # rubocop:disable Documentation
include ::Openstack
end
if node['openstack']['metering']['syslog']['use']
if node['openstack']['telemetry']['syslog']['use']
include_recipe 'openstack-common::logging'
end
platform = node['openstack']['metering']['platform']
platform = node['openstack']['telemetry']['platform']
platform['common_packages'].each do |pkg|
package pkg
end
mq_service_type = node['openstack']['mq']['metering']['service_type']
mq_service_type = node['openstack']['mq']['telemetry']['service_type']
if mq_service_type == 'rabbitmq'
mq_password = get_password 'user', node['openstack']['mq']['metering']['rabbit']['userid']
mq_password = get_password 'user', node['openstack']['mq']['telemetry']['rabbit']['userid']
elsif mq_service_type == 'qpid'
mq_password = get_password 'user', node['openstack']['mq']['metering']['qpid']['username']
mq_password = get_password 'user', node['openstack']['mq']['telemetry']['qpid']['username']
end
db_user = node['openstack']['db']['metering']['username']
db_user = node['openstack']['db']['telemetry']['username']
db_pass = get_password 'db', 'ceilometer'
db_uri = db_uri('metering', db_user, db_pass).to_s
db_uri = db_uri('telemetry', db_user, db_pass).to_s
service_user = node['openstack']['metering']['service_user']
service_user = node['openstack']['telemetry']['service_user']
service_pass = get_password 'service', 'openstack-ceilometer'
service_tenant = node['openstack']['metering']['service_tenant_name']
service_tenant = node['openstack']['telemetry']['service_tenant_name']
identity_endpoint = endpoint 'identity-api'
identity_admin_endpoint = endpoint 'identity-admin'
image_endpoint = endpoint 'image-api'
Chef::Log.debug("openstack-metering::common:service_user|#{service_user}")
Chef::Log.debug("openstack-metering::common:service_tenant|#{service_tenant}")
Chef::Log.debug("openstack-metering::common:identity_endpoint|#{identity_endpoint.to_s}")
Chef::Log.debug("openstack-telemetry::common:service_user|#{service_user}")
Chef::Log.debug("openstack-telemetry::common:service_tenant|#{service_tenant}")
Chef::Log.debug("openstack-telemetry::common:identity_endpoint|#{identity_endpoint.to_s}")
directory node['openstack']['metering']['conf_dir'] do
owner node['openstack']['metering']['user']
group node['openstack']['metering']['group']
directory node['openstack']['telemetry']['conf_dir'] do
owner node['openstack']['telemetry']['user']
group node['openstack']['telemetry']['group']
mode 00750
action :create
end
template node['openstack']['metering']['conf'] do
template node['openstack']['telemetry']['conf'] do
source 'ceilometer.conf.erb'
owner node['openstack']['metering']['user']
group node['openstack']['metering']['group']
owner node['openstack']['telemetry']['user']
group node['openstack']['telemetry']['group']
mode 00640
variables(
@ -88,6 +88,6 @@ end
cookbook_file '/etc/ceilometer/policy.json' do
source 'policy.json'
mode 00640
owner node['openstack']['metering']['user']
group node['openstack']['metering']['group']
owner node['openstack']['telemetry']['user']
group node['openstack']['telemetry']['group']
end

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-metering
# Cookbook Name:: openstack-telemetry
# Recipe:: identity_registration
#
# Copyright 2013, AT&T Services, Inc.
@ -24,14 +24,14 @@ class ::Chef::Recipe # rubocop:disable Documentation
include ::Openstack
end
api_endpoint = endpoint 'metering-api'
api_endpoint = endpoint 'telemetry-api'
identity_admin_endpoint = endpoint 'identity-admin'
bootstrap_token = secret 'secrets', 'openstack_identity_bootstrap_token'
auth_uri = ::URI.decode identity_admin_endpoint.to_s
service_pass = get_password 'service', 'openstack-ceilometer'
service_user = node['openstack']['metering']['service_user']
service_role = node['openstack']['metering']['service_role']
service_tenant_name = node['openstack']['metering']['service_tenant_name']
service_user = node['openstack']['telemetry']['service_user']
service_role = node['openstack']['telemetry']['service_role']
service_tenant_name = node['openstack']['telemetry']['service_tenant_name']
# Register Service Tenant
openstack_identity_register 'Register Service Tenant' do
@ -79,7 +79,7 @@ openstack_identity_register 'Register Metering Endpoint' do
auth_uri auth_uri
bootstrap_token bootstrap_token
service_type 'metering'
endpoint_region node['openstack']['metering']['region']
endpoint_region node['openstack']['telemetry']['region']
endpoint_adminurl ::URI.decode api_endpoint.to_s
endpoint_internalurl ::URI.decode api_endpoint.to_s
endpoint_publicurl ::URI.decode api_endpoint.to_s

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::agent-central' do
before { metering_stubs }
describe 'openstack-telemetry::agent-central' do
before { telemetry_stubs }
describe 'rhel' do
before do
@chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
@chef_run.converge 'openstack-metering::agent-central'
@chef_run.converge 'openstack-telemetry::agent-central'
end
expect_runs_common_recipe

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::agent-central' do
before { metering_stubs }
describe 'openstack-telemetry::agent-central' do
before { telemetry_stubs }
describe 'suse' do
before do
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
@chef_run.converge 'openstack-metering::agent-central'
@chef_run.converge 'openstack-telemetry::agent-central'
end
it 'installs the agent-central package' do

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::agent-central' do
before { metering_stubs }
describe 'openstack-telemetry::agent-central' do
before { telemetry_stubs }
describe 'ubuntu' do
before do
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge 'openstack-metering::agent-central'
@chef_run.converge 'openstack-telemetry::agent-central'
end
expect_runs_common_recipe

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::agent-compute' do
before { metering_stubs }
describe 'openstack-telemetry::agent-compute' do
before { telemetry_stubs }
describe 'rhel' do
before do
@chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
@chef_run.converge 'openstack-metering::agent-compute'
@chef_run.converge 'openstack-telemetry::agent-compute'
end
expect_runs_common_recipe

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::agent-compute' do
before { metering_stubs }
describe 'openstack-telemetry::agent-compute' do
before { telemetry_stubs }
describe 'suse' do
before do
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
@chef_run.converge 'openstack-metering::agent-compute'
@chef_run.converge 'openstack-telemetry::agent-compute'
end
it 'installs the agent-compute package' do

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::agent-compute' do
before { metering_stubs }
describe 'openstack-telemetry::agent-compute' do
before { telemetry_stubs }
describe 'ubuntu' do
before do
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge 'openstack-metering::agent-compute'
@chef_run.converge 'openstack-telemetry::agent-compute'
end
expect_runs_common_recipe

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::api' do
before { metering_stubs }
describe 'openstack-telemetry::api' do
before { telemetry_stubs }
describe 'rhel' do
before do
@chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
@chef_run.converge 'openstack-metering::api'
@chef_run.converge 'openstack-telemetry::api'
end
expect_runs_common_recipe

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::api' do
before { metering_stubs }
describe 'openstack-telemetry::api' do
before { telemetry_stubs }
describe 'suse' do
before do
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
@chef_run.converge 'openstack-metering::api'
@chef_run.converge 'openstack-telemetry::api'
end
it 'installs the api package' do

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::api' do
before { metering_stubs }
describe 'openstack-telemetry::api' do
before { telemetry_stubs }
describe 'ubuntu' do
before do
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge 'openstack-metering::api'
@chef_run.converge 'openstack-telemetry::api'
end
expect_runs_common_recipe

View File

@ -1,7 +1,7 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::client' do
describe 'openstack-telemetry::client' do
describe 'redhat' do

View File

@ -1,7 +1,7 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::client' do
describe 'openstack-telemetry::client' do
describe 'ubuntu' do

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::collector' do
before { metering_stubs }
describe 'openstack-telemetry::collector' do
before { telemetry_stubs }
describe 'rhel' do
before do
@chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
@chef_run.converge 'openstack-metering::collector'
@chef_run.converge 'openstack-telemetry::collector'
end
expect_runs_common_recipe

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::collector' do
before { metering_stubs }
describe 'openstack-telemetry::collector' do
before { telemetry_stubs }
describe 'suse' do
before do
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
@chef_run.converge 'openstack-metering::collector'
@chef_run.converge 'openstack-telemetry::collector'
end
it 'installs the collector package' do

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::collector' do
before { metering_stubs }
describe 'openstack-telemetry::collector' do
before { telemetry_stubs }
describe 'ubuntu' do
before do
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge 'openstack-metering::collector'
@chef_run.converge 'openstack-telemetry::collector'
end
expect_runs_common_recipe
@ -17,7 +17,7 @@ describe 'openstack-metering::collector' do
end
it 'does not execute ceilometer dbsync when nosql database is used' do
@chef_run.node.set['openstack']['db']['metering']['nosql']['used'] = true
@chef_run.node.set['openstack']['db']['telemetry']['nosql']['used'] = true
resource = 'execute[database migration]'
expect(@chef_run).not_to run_execute resource
end

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::common' do
before { metering_stubs }
describe 'openstack-telemetry::common' do
before { telemetry_stubs }
describe 'rhel' do
before do
@chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
@chef_run.converge 'openstack-metering::common'
@chef_run.converge 'openstack-telemetry::common'
end
it 'installs the common package' do

View File

@ -1,12 +1,12 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::common' do
before { metering_stubs }
describe 'openstack-telemetry::common' do
before { telemetry_stubs }
describe 'suse' do
before do
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
@chef_run.converge 'openstack-metering::common'
@chef_run.converge 'openstack-telemetry::common'
end
it 'installs the common package' do

View File

@ -1,14 +1,14 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::common' do
before { metering_stubs }
describe 'openstack-telemetry::common' do
before { telemetry_stubs }
describe 'ubuntu' do
before do
@chef_run = ::ChefSpec::Runner.new(::UBUNTU_OPTS) do |n|
n.set['openstack']['metering']['syslog']['use'] = true
n.set['openstack']['telemetry']['syslog']['use'] = true
end
@chef_run.converge 'openstack-metering::common'
@chef_run.converge 'openstack-telemetry::common'
end
it 'runs logging recipe' do
@ -60,9 +60,9 @@ describe 'openstack-metering::common' do
context 'with qpid enabled' do
before do
@chef_run.node.set['openstack']['mq']['metering']['service_type'] = 'qpid'
@chef_run.node.set['openstack']['mq']['metering']['qpid']['username'] = 'guest'
@chef_run.converge 'openstack-metering::common'
@chef_run.node.set['openstack']['mq']['telemetry']['service_type'] = 'qpid'
@chef_run.node.set['openstack']['mq']['telemetry']['qpid']['username'] = 'guest'
@chef_run.converge 'openstack-telemetry::common'
end
[/^qpid_hostname=127.0.0.1$/,

View File

@ -1,11 +1,11 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-metering::identity_registration' do
describe 'openstack-telemetry::identity_registration' do
before do
metering_stubs
telemetry_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge 'openstack-metering::identity_registration'
@chef_run.converge 'openstack-telemetry::identity_registration'
end
it 'registers service tenant' do
@ -71,9 +71,9 @@ describe 'openstack-metering::identity_registration' do
it 'overrides metering endpoint region' do
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
n.set['openstack']['metering']['region'] = 'meteringRegion'
n.set['openstack']['telemetry']['region'] = 'meteringRegion'
end
@chef_run.converge 'openstack-metering::identity_registration'
@chef_run.converge 'openstack-telemetry::identity_registration'
expect(@chef_run).to create_endpoint_openstack_identity_register(
'Register Metering Endpoint'

View File

@ -21,7 +21,7 @@ require 'chef/application'
}
# TODO(chrislaco): Factor this into proper RSpec shared_contexts
def metering_stubs # rubocop:disable MethodLength
def telemetry_stubs # rubocop:disable MethodLength
::Chef::Recipe.any_instance.stub(:memcached_servers).and_return([])
::Chef::Recipe.any_instance.stub(:get_password)
.with('db', anything)
@ -40,12 +40,12 @@ end
def expect_runs_common_recipe
it 'runs common recipe' do
expect(@chef_run).to include_recipe 'openstack-metering::common'
expect(@chef_run).to include_recipe 'openstack-telemetry::common'
end
end
# README(galstrom21): This will remove any coverage warnings from
# dependent cookbooks
ChefSpec::Coverage.filters << '*/openstack-metering'
ChefSpec::Coverage.filters << '*/openstack-telemetry'
at_exit { ChefSpec::Coverage.report! }

View File

@ -1,6 +1,6 @@
[DEFAULT]
<% if node["openstack"]["metering"]["host"] %>
host = <%= node["openstack"]["metering"]["host"] %>
<% if node["openstack"]["telemetry"]["host"] %>
host = <%= node["openstack"]["telemetry"]["host"] %>
<% end %>
os_auth_url = <%= @auth_uri %>
os_tenant_name = <%= @service_tenant_name %>
@ -8,21 +8,21 @@ os_password = <%= @service_pass %>
os_username = <%= @service_user %>
policy_file = /etc/ceilometer/policy.json
database_connection = <%= @database_connection %>
verbose = <%= node["openstack"]["metering"]["verbose"] %>
debug = <%= node["openstack"]["metering"]["debug"] %>
<% if node["openstack"]["metering"]["syslog"]["use"] %>
verbose = <%= node["openstack"]["telemetry"]["verbose"] %>
debug = <%= node["openstack"]["telemetry"]["debug"] %>
<% if node["openstack"]["telemetry"]["syslog"]["use"] %>
log_config = /etc/openstack/logging.conf
<% end %>
notification_topics = notifications,glance_notifications
<% if @mq_service_type == "rabbitmq" %>
##### RABBITMQ #####
rabbit_userid = <%= node["openstack"]["mq"]["metering"]["rabbit"]["userid"] %>
rabbit_userid = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["userid"] %>
rabbit_password = <%= @mq_password %>
rabbit_port = <%= node["openstack"]["mq"]["metering"]["rabbit"]["port"] %>
rabbit_host = <%= node["openstack"]["mq"]["metering"]["rabbit"]["host"] %>
rabbit_virtual_host = <%= node["openstack"]["mq"]["metering"]["rabbit"]["vhost"] %>
rabbit_use_ssl = <%= node["openstack"]["mq"]["metering"]["rabbit"]["use_ssl"] %>
rabbit_port = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["port"] %>
rabbit_host = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["host"] %>
rabbit_virtual_host = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["vhost"] %>
rabbit_use_ssl = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["use_ssl"] %>
rpc_backend = ceilometer.openstack.common.rpc.impl_kombu
<% end %>
@ -30,27 +30,27 @@ rpc_backend = ceilometer.openstack.common.rpc.impl_kombu
<% if @mq_service_type == "qpid" %>
##### QPID #####
rpc_backend=ceilometer.openstack.common.rpc.impl_qpid
qpid_hostname=<%= node["openstack"]["mq"]["metering"]["qpid"]["host"] %>
qpid_port=<%= node["openstack"]["mq"]["metering"]["qpid"]["port"] %>
qpid_hostname=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["host"] %>
qpid_port=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["port"] %>
qpid_password=<%= @mq_password %>
qpid_username=<%= node["openstack"]["mq"]["metering"]["qpid"]["username"] %>
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["metering"]["qpid"]["sasl_mechanisms"] %>
qpid_reconnect=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect"] %>
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_timeout"] %>
qpid_reconnect_limit=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_limit"] %>
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_interval_min"] %>
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_interval_max"] %>
qpid_reconnect_interval=<%= node["openstack"]["mq"]["metering"]["qpid"]["reconnect_interval"] %>
qpid_heartbeat=<%= node["openstack"]["mq"]["metering"]["qpid"]["heartbeat"] %>
qpid_username=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["username"] %>
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["sasl_mechanisms"] %>
qpid_reconnect=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect"] %>
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_timeout"] %>
qpid_reconnect_limit=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_limit"] %>
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval_min"] %>
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval_max"] %>
qpid_reconnect_interval=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["reconnect_interval"] %>
qpid_heartbeat=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["heartbeat"] %>
# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL
qpid_protocol=<%= node["openstack"]["mq"]["metering"]["qpid"]["protocol"] %>
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["metering"]["qpid"]["tcp_nodelay"] %>
qpid_protocol=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["protocol"] %>
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["tcp_nodelay"] %>
<% end %>
glance_registry_host = <%= @image_endpoint.host %>
periodic_interval = <%= node["openstack"]["metering"]["periodic_interval"] %>
periodic_interval = <%= node["openstack"]["telemetry"]["periodic_interval"] %>
[keystone_authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
@ -61,4 +61,4 @@ auth_protocol = <%= @identity_admin_endpoint.scheme %>
admin_tenant_name = <%= @service_tenant_name %>
admin_user = <%= @service_user %>
admin_password = <%= @service_pass %>
signing_dir = <%= node["openstack"]["metering"]["api"]["auth"]["cache_dir"] %>
signing_dir = <%= node["openstack"]["telemetry"]["api"]["auth"]["cache_dir"] %>