openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "scenario001: deploy & test Aodh"

Browse Source
This commit is contained in:
Jenkins 2015-12-01 14:58:31 +00:00 committed by Gerrit Code Review
commit b4a39fdcca
3 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -39,6 +39,7 @@ scenario](#All-In-One).
| neutron | X | X | X |
| cinder | X | | X |
| ceilometer | X | | |
| aodh | X | | |
| heat | | X | |
| swift | | X | |
| sahara | | X | |

57
fixtures/scenario001.pp
View File

@ -20,13 +20,13 @@ include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
include ::openstack_integration::keystone
rabbitmq_user { ['neutron', 'nova', 'cinder', 'ceilometer', 'glance', 'trove']:
rabbitmq_user { ['neutron', 'nova', 'cinder', 'ceilometer', 'aodh', 'glance', 'trove']:
admin => true,
password => 'an_even_bigger_secret',
provider => 'rabbitmqctl',
require => Class['::rabbitmq'],
}
rabbitmq_user_permissions { ['neutron@/', 'nova@/', 'cinder@/', 'ceilometer@/', 'glance@/', 'trove@/']:
rabbitmq_user_permissions { ['neutron@/', 'nova@/', 'cinder@/', 'ceilometer@/', 'aodh@/', 'glance@/', 'trove@/']:
configure_permission => '.*',
write_permission => '.*',
read_permission => '.*',
@ -253,8 +253,6 @@ class { '::ceilometer::wsgi::apache':
}
class { '::ceilometer::collector': }
class { '::ceilometer::expirer': }
class { '::ceilometer::alarm::evaluator': }
class { '::ceilometer::alarm::notifier': }
class { '::ceilometer::agent::notification': }
class { '::ceilometer::agent::polling': }
class { '::ceilometer::agent::auth':
@ -262,6 +260,56 @@ class { '::ceilometer::agent::auth':
auth_url => 'http://127.0.0.1:5000/v2.0',
}
# Aodh is not yet packaged in UCA, but only in RDO.
case $::osfamily {
'Debian': {
class { '::ceilometer::alarm::evaluator': }
class { '::ceilometer::alarm::notifier': }
# for tempest
$aodh_enabled = false
}
'RedHat': {
class { '::aodh':
rabbit_userid => 'aodh',
rabbit_password => 'an_even_bigger_secret',
verbose => true,
debug => true,
rabbit_host => '127.0.0.1',
database_connection => 'mysql://aodh:aodh@127.0.0.1/aodh?charset=utf8',
}
class { '::aodh::db::mysql':
password => 'aodh',
}
class { '::aodh::keystone::auth':
password => 'a_big_secret',
}
class { '::aodh::api':
enabled => true,
keystone_password => 'a_big_secret',
keystone_identity_uri => 'http://127.0.0.1:35357/',
keystone_auth_uri => 'http://127.0.0.1:35357/',
service_name => 'httpd',
}
class { '::aodh::wsgi::apache':
ssl => false,
}
class { '::aodh::auth':
auth_url => 'http://127.0.0.1:5000/v2.0',
auth_password => 'a_big_secret',
}
class { '::aodh::client': }
class { '::aodh::notifier': }
class { '::aodh::listener': }
class { '::aodh::evaluator': }
class { '::aodh::db::sync': }
# for tempest
$aodh_enabled = true
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
# Deploy Trove
class { '::trove':
database_connection => 'mysql://trove:trove@127.0.0.1/trove?charset=utf8',
@ -389,6 +437,7 @@ class { '::tempest':
nova_available => true,
neutron_available => true,
ceilometer_available => true,
aodh_available => $aodh_enabled,
trove_available => true,
sahara_available => false,
heat_available => false,

7
run_tests.sh
View File

@ -89,5 +89,8 @@ fi
# TODO(emilien) later, we should use local image if present. That would be a next iteration.
wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/openstack/tempest
# run tempest smoke suite
cd /tmp/openstack/tempest; tox -eall -- --concurrency=2 smoke dashboard
# Select what to test:
# - smoke suite
# - dashboard (horizon)
# - TelemetryAlarming (Aodh)
cd /tmp/openstack/tempest; tox -eall -- --concurrency=2 smoke dashboard TelemetryAlarming