add telemetry to allinone setup, data bag items

- adds telemetry to allinone role
- add telemetry-related data bag items
- use database as default store until gnocchi packages work on trusty
- add some basic ceilometer api querys to Rakefile

Change-Id: I87ff3df0dc92b9e9f5c7abc06727b53be521d8c7
Depends-On: If513cb2715d8266845bd6541d12005edef70f11c
Depends-On: I432555c558adfd9db07b27acd15365e333a13dc2
This commit is contained in:
Jan Klare 2016-05-25 15:07:18 +02:00
parent a25d83fad1
commit e4870d3dab
8 changed files with 70 additions and 1 deletions

View File

@ -144,6 +144,14 @@ def _run_basic_queries # rubocop:disable Metrics/MethodLength
end
end
# Helper for setting up basic ceilometer tests
def _run_ceilometer_tests(pass) # rubocop:disable Metrics/MethodLength
_run_commands('ceilometer api query', {
'ceilometer' => ['meter-list', 'resource-list', 'sample-list']
}
)
end
# Helper for setting up basic nova tests
def _run_nova_tests(pass) # rubocop:disable Metrics/MethodLength
_run_commands('cinder storage volume create', {
@ -184,7 +192,7 @@ end
def _save_logs(prefix, log_dir)
sh %(sleep 25)
%w(nova neutron keystone cinder glance heat apache2 rabbitmq mysql openvswitch mariadb).each do |project|
%w(nova neutron keystone cinder glance heat apache2 rabbitmq mysql openvswitch mariadb ceilometer).each do |project|
sh %(mkdir -p #{log_dir}/#{prefix}/#{project})
sh %(sudo cp -r /etc/#{project} #{log_dir}/#{prefix}/#{project}/etc || true)
sh %(sudo cp -r /var/log/#{project} #{log_dir}/#{prefix}/#{project}/log || true)
@ -210,6 +218,7 @@ task :integration => [:create_key, :berks_vendor] do
end
_run_basic_queries
_run_nova_tests(i)
_run_ceilometer_tests(i)
rescue => e
raise "####### Pass #{i} failed with #{e.message}"

View File

@ -0,0 +1,9 @@
{
"id": "ceilometer",
"ceilometer": {
"encrypted_data": "Zdr3H03rezw+BSX0StHj3ozdL9nqYvJCwmMLqy9Nn7c=\n",
"iv": "wMxOW4RqShzu1ODrCpxIfg==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}

View File

@ -0,0 +1,9 @@
{
"id": "gnocchi",
"gnocchi": {
"encrypted_data": "EpFQEmW+m7zb/d45soGzyPzFeB2znpdjZl2zK2Vb2cc=\n",
"iv": "Z+u8/jm52OTyFYZewO+auQ==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}

View File

@ -0,0 +1,9 @@
{
"id": "openstack-telemetry-metric",
"openstack-telemetry-metric": {
"encrypted_data": "MxONrTYA8z67NSlFm+Bgic2Su+Om6cybtOGxGXp5I+E=\n",
"iv": "uvwXZTPEQmbrv6Oa7NIhUA==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}

View File

@ -0,0 +1,9 @@
{
"id": "openstack-telemetry",
"openstack-telemetry": {
"encrypted_data": "guhT/TkxmrFfOptB0miQDnOEY7YmYgZHBvmhZHxLMmg=\n",
"iv": "5UrdKn9Q5PPgKDAJ2IHcGg==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}

View File

@ -12,6 +12,13 @@
}
},
"openstack": {
"telemetry": {
"conf": {
"DEFAULT": {
"meter_dispatchers": "database"
}
}
},
"yum": {
"rdo_delorean_enabled": true,
"gpgcheck": false

View File

@ -15,6 +15,16 @@
},
"override_attributes": {
"openstack": {
"telemetry": {
"platform": {
"client_packages": ["python-ceilometerclient"]
},
"conf": {
"DEFAULT": {
"meter_dispatchers": "database"
}
}
},
"dashboard": {
"server_hostname": "localhost"
},

View File

@ -55,6 +55,13 @@
"recipe[openstack-orchestration::api-cfn]",
"recipe[openstack-orchestration::api-cloudwatch]",
"recipe[openstack-orchestration::identity_registration]",
"recipe[openstack-telemetry::api]",
"recipe[openstack-telemetry::agent-central]",
"recipe[openstack-telemetry::agent-compute]",
"recipe[openstack-telemetry::agent-notification]",
"recipe[openstack-telemetry::collector]",
"recipe[openstack-telemetry::identity_registration]",
"recipe[openstack-telemetry::client]",
"recipe[openstack-image::image_upload]",
"recipe[openstack-common::client]",
"recipe[openstack-dashboard::server]"