diff options
| -rw-r--r-- | manifests/packages.pp | 36 | ||||
| -rw-r--r-- | manifests/packages/upgrades.pp | 43 | ||||
| -rw-r--r-- | manifests/profile/base/aodh.pp | 6 | ||||
| -rw-r--r-- | manifests/profile/base/ceilometer.pp | 11 | ||||
| -rw-r--r-- | manifests/profile/base/cinder.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/glance/api.pp | 8 | ||||
| -rw-r--r-- | manifests/profile/base/heat.pp | 23 | ||||
| -rw-r--r-- | manifests/profile/base/ironic.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/keystone.pp | 30 | ||||
| -rw-r--r-- | manifests/profile/base/manila.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/mistral.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/neutron.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/nova.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/nova/api.pp | 24 | ||||
| -rw-r--r-- | manifests/profile/base/rabbitmq.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/base/sahara.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/base/swift/storage.pp | 1 | ||||
| -rw-r--r-- | spec/classes/tripleo_packages_spec.rb | 5 | ||||
| -rw-r--r-- | spec/classes/tripleo_profile_base_aodh_spec.rb | 4 | ||||
| -rw-r--r-- | spec/classes/tripleo_profile_base_ceilometer_spec.rb | 2 |
21 files changed, 169 insertions, 77 deletions
diff --git a/manifests/packages.pp b/manifests/packages.pp index 5e111fa..ec2635a 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -32,6 +32,9 @@ class tripleo::packages ( $enable_upgrade = false, ) { + # required for stages + include ::stdlib + if !$enable_install and !$enable_upgrade { case $::osfamily { 'RedHat': { @@ -45,33 +48,12 @@ class tripleo::packages ( if $enable_upgrade { Package <| |> { ensure => 'latest' } - - case $::osfamily { - 'RedHat': { - $pkg_upgrade_cmd = 'yum -y update' - } - default: { - warning('Please specify a package upgrade command for distribution.') - } - } - - exec { 'package-upgrade': - command => $pkg_upgrade_cmd, - path => '/usr/bin', - timeout => 0, - } - # A resource chain to ensure the upgrade ordering we want: - # 1) Upgrade all packages via exec. - # Note: The Package Puppet resources can be managed after or before package-upgrade, - # it does not matter. what we need to make sure is that they'll notify their - # respective services (if they have ~> in their manifests or here with the ->) - # for the other packages, they'll be upgraded before any Service notify. - # This approach prevents from Puppet dependencies cycle. - # 2) This upgrade will be run before any Service notified & managed by Puppet. - # Note: For example, during the Puppet catalog, configuration will change for most of - # the services so the Services will be likely restarted after the package upgrade. - Exec['package-upgrade'] -> Service <| |> - + # Running the package upgrade before managing Services in the main stage. + # So we're sure that services will be able to restart with the new version + # of the package. + ensure_resource('class', 'tripleo::packages::upgrades', { + 'stage' => 'setup', + }) } } diff --git a/manifests/packages/upgrades.pp b/manifests/packages/upgrades.pp new file mode 100644 index 0000000..a6ca1c8 --- /dev/null +++ b/manifests/packages/upgrades.pp @@ -0,0 +1,43 @@ +# Copyright 2016 Red Hat, Inc. +# All Rights Reserved. +# +# 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. + +# == Class: tripleo::packages::upgrades +# +# Upgrade packages using yum. +# +class tripleo::packages::upgrades { + + # required for stages + include ::stdlib + + case $::osfamily { + 'RedHat': { + $pkg_upgrade_cmd = 'yum -y update' + } + default: { + fail('Please specify a package upgrade command for distribution.') + } + } + + # Running the package upgrade before managing Services in the main stage. + # So we're sure that services will be able to restart with the new version + # of the package. + ensure_resource('exec', 'package-upgrade', { + 'command' => $pkg_upgrade_cmd, + 'path' => '/usr/bin', + 'timeout' => 0, + }) + +} diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp index 49a543a..02c1d07 100644 --- a/manifests/profile/base/aodh.pp +++ b/manifests/profile/base/aodh.pp @@ -31,11 +31,15 @@ # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') # +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('aodh::rabbit_port', 5672) class tripleo::profile::base::aodh ( $step = hiera('step'), $bootstrap_node = hiera('bootstrap_nodeid', undef), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('aodh::rabbit_port', 5672), ) { if $::hostname == downcase($bootstrap_node) { @@ -46,7 +50,7 @@ class tripleo::profile::base::aodh ( if $step >= 4 or ($step >= 3 and $sync_db) { class { '::aodh' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::aodh::auth include ::aodh::config diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp index aaf904f..959d86c 100644 --- a/manifests/profile/base/ceilometer.pp +++ b/manifests/profile/base/ceilometer.pp @@ -26,15 +26,20 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('ceilometer::rabbit_port', 5672) class tripleo::profile::base::ceilometer ( - $step = hiera('step'), - $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('ceilometer::rabbit_port', 5672), ) { if $step >= 3 { class { '::ceilometer' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::ceilometer::config } diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp index 510ea40..9f7c453 100644 --- a/manifests/profile/base/cinder.pp +++ b/manifests/profile/base/cinder.pp @@ -33,12 +33,17 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('cinder::rabbit_port', 5672) class tripleo::profile::base::cinder ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $cinder_enable_db_purge = true, $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('cinder::rabbit_port', 5672), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -48,7 +53,7 @@ class tripleo::profile::base::cinder ( if $step >= 4 or ($step >= 3 and $sync_db) { class { '::cinder' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::cinder::config } diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index ecffd7f..f3db396 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -30,11 +30,16 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('glance::notify::rabbitmq::rabbit_port', 5672) class tripleo::profile::base::glance::api ( $glance_backend = downcase(hiera('glance_backend', 'swift')), $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('glance::notify::rabbitmq::rabbit_port', 5672), ) { if $step >= 4 { @@ -53,8 +58,9 @@ class tripleo::profile::base::glance::api ( class { '::glance::api': stores => $glance_store, } + class { '::glance::notify::rabbitmq' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include join(['::glance::backend::', $glance_backend]) } diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index 027ab7e..abb9f76 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -38,6 +38,10 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('heat::rabbit_port', 5672) class tripleo::profile::base::heat ( $bootstrap_node = downcase(hiera('bootstrap_nodeid')), @@ -45,8 +49,9 @@ class tripleo::profile::base::heat ( $notification_driver = 'messaging', $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('heat::rabbit_port', 5672), ) { - # Domain resources will be created at step5 on the bootstrap_node so we + # Domain resources will be created at step5 on the node running keystone.pp # configure heat.conf at step3 and 4 but actually create the domain later. if $step == 3 or $step == 4 { class { '::heat::keystone::domain': @@ -59,7 +64,7 @@ class tripleo::profile::base::heat ( if $step >= 4 { class { '::heat' : notification_driver => $notification_driver, - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::heat::config include ::heat::cors @@ -69,20 +74,6 @@ class tripleo::profile::base::heat ( if $manage_db_purge { include ::heat::cron::purge_deleted } - if $bootstrap_node == $::hostname { - # Class ::heat::keystone::domain has to run on bootstrap node - # because it creates DB entities via API calls. - include ::heat::keystone::domain - - Class['::keystone::roles::admin'] -> Class['::heat::keystone::domain'] - } else { - # On non-bootstrap node we don't need to create Keystone resources again - class { '::heat::keystone::domain': - manage_domain => false, - manage_user => false, - manage_role => false, - } - } } } diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp index c4e525a..e63e4c6 100644 --- a/manifests/profile/base/ironic.pp +++ b/manifests/profile/base/ironic.pp @@ -29,11 +29,16 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('ironic::rabbit_port', 5672) class tripleo::profile::base::ironic ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('ironic::rabbit_port', 5672), ) { # Database is accessed by both API and conductor, hence it's here. if $::hostname == downcase($bootstrap_node) { @@ -45,7 +50,7 @@ class tripleo::profile::base::ironic ( if $step >= 4 or ($step >= 3 and $sync_db) { class { '::ironic': sync_db => $sync_db, - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::ironic::cors diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index d515f8f..fbccdda 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -34,28 +34,35 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('keystone::rabbit_port', 5672) class tripleo::profile::base::keystone ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $manage_db_purge = hiera('keystone_enable_db_purge', true), $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('keystone::rabbit_port', 5672), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true $manage_roles = true $manage_endpoint = true + $manage_domain = true } else { $sync_db = false $manage_roles = false $manage_endpoint = false + $manage_domain = false } if $step >= 4 or ( $step >= 3 and $sync_db ) { class { '::keystone': sync_db => $sync_db, enable_bootstrap => $sync_db, - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::keystone::config @@ -76,6 +83,27 @@ class tripleo::profile::base::keystone ( include ::keystone::cron::token_flush } + if $step >= 5 and $manage_domain { + if hiera('heat_engine_enabled', false) { + # if Heat and Keystone are collocated, so we want to + # both configure heat.conf and create Keystone resources. + # note: domain_password is given via Hiera. + if defined(Class['::tripleo::profile::base::heat']) { + include ::heat::keystone::domain + } else { + # if Heat and Keystone are not collocated, we want Puppet + # to only create Keystone resources on the Keystone node + # but not try to configure Heat, to avoid leaking the password. + class { '::heat::keystone::domain': + domain_name => $::os_service_default, + domain_admin => $::os_service_default, + domain_password => $::os_service_default, + } + } + Class['::keystone::roles::admin'] -> Class['::heat::keystone::domain'] + } + } + if $step >= 5 and $manage_endpoint{ if hiera('aodh_api_enabled', false) { include ::aodh::keystone::auth diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp index 5210284..393dd52 100644 --- a/manifests/profile/base/manila.pp +++ b/manifests/profile/base/manila.pp @@ -29,11 +29,16 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('manila::rabbit_port', 5672) class tripleo::profile::base::manila ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('manila::rabbit_port', 5672), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -43,7 +48,7 @@ class tripleo::profile::base::manila ( if $step >= 4 or ($step >= 3 and $sync_db) { class { '::manila' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::manila::config } diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp index 9986d22..dcd9d0b 100644 --- a/manifests/profile/base/mistral.pp +++ b/manifests/profile/base/mistral.pp @@ -30,11 +30,16 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('mistral::rabbit_port', 5672) class tripleo::profile::base::mistral ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('mistral::rabbit_port', 5672), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -44,7 +49,7 @@ class tripleo::profile::base::mistral ( if $step >= 4 or ($step >= 3 and $sync_db) { class { '::mistral': - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::mistral::config include ::mistral::client diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp index 90a5c23..53df3d9 100644 --- a/manifests/profile/base/neutron.pp +++ b/manifests/profile/base/neutron.pp @@ -25,14 +25,19 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('neutron::rabbit_port', 5672 class tripleo::profile::base::neutron ( $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('neutron::rabbit_port', 5672), ) { if $step >= 3 { class { '::neutron' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::neutron::config } diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 74f0460..b397802 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -41,6 +41,10 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('nova::rabbit_port', 5672) class tripleo::profile::base::nova ( $bootstrap_node = hiera('bootstrap_nodeid', undef), @@ -49,6 +53,7 @@ class tripleo::profile::base::nova ( $nova_compute_enabled = false, $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('nova::rabbit_port', 5672), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -64,7 +69,7 @@ class tripleo::profile::base::nova ( if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) { class { '::nova' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::nova::config class { '::nova::cache': diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp index 03706dc..ca2f7dd 100644 --- a/manifests/profile/base/nova/api.pp +++ b/manifests/profile/base/nova/api.pp @@ -39,23 +39,19 @@ class tripleo::profile::base::nova::api ( if $step >= 4 or ($step >= 3 and $sync_db) { - # Manages the migration to Nova API in mod_wsgi with Apache. - # - First update nova.conf with new parameters - # - Stop nova-api process before starting apache to avoid binding error - # - Start apache after configuring all vhosts - exec { 'stop_nova-api': - command => 'service openstack-nova-api stop', - path => ['/usr/bin', '/usr/sbin'], - onlyif => 'systemctl is-active openstack-nova-api', - refreshonly => true, + if hiera('nova::use_ipv6', false) { + $memcache_servers = suffix(any2array(normalize_ip_for_uri(hiera('memcached_node_ips_v6'))), ':11211') + } else { + $memcache_servers = suffix(any2array(normalize_ip_for_uri(hiera('memcached_node_ips'))), ':11211') + } + + class { '::nova::keystone::authtoken': + memcached_servers => $memcache_servers } - Nova_config<||> ~> Exec['stop_nova-api'] - Exec['stop_nova-api'] -> Service['httpd'] class { '::nova::api': - service_name => 'httpd', # Temporary: will be moved to t-h-t - sync_db => $sync_db, - sync_db_api => $sync_db, + sync_db => $sync_db, + sync_db_api => $sync_db, } include ::nova::wsgi::apache include ::nova::network::neutron diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp index 2fd2347..b521999 100644 --- a/manifests/profile/base/rabbitmq.pp +++ b/manifests/profile/base/rabbitmq.pp @@ -54,7 +54,8 @@ class tripleo::profile::base::rabbitmq ( # IPv6 environment, necessary for RabbitMQ. if $ipv6 { $rabbit_env = merge($environment, { - 'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"' + 'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"', + 'RABBITMQ_CTL_ERL_ARGS' => '"-proto_dist inet6_tcp"' }) } else { $rabbit_env = $environment diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp index cf0ee90..c034628 100644 --- a/manifests/profile/base/sahara.pp +++ b/manifests/profile/base/sahara.pp @@ -29,11 +29,16 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('sahara::rabbit_port', 5672) class tripleo::profile::base::sahara ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('sahara::rabbit_port', 5672), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -44,7 +49,7 @@ class tripleo::profile::base::sahara ( if $step >= 4 or ($step >= 3 and $sync_db){ class { '::sahara': sync_db => $sync_db, - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } } } diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 8cb1132..feabf86 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -38,6 +38,7 @@ class tripleo::profile::base::swift::proxy ( ) { if $step >= 4 { $swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}") + include ::swift::config include ::swift::proxy include ::swift::proxy::proxy_logging include ::swift::proxy::healthcheck diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp index d1660de..568be66 100644 --- a/manifests/profile/base/swift/storage.pp +++ b/manifests/profile/base/swift/storage.pp @@ -34,6 +34,7 @@ class tripleo::profile::base::swift::storage ( ) { if $step >= 4 { if $enable_swift_storage { + include ::swift::config include ::swift::storage::disks include ::swift::storage::all if(!defined(File['/srv/node'])) { diff --git a/spec/classes/tripleo_packages_spec.rb b/spec/classes/tripleo_packages_spec.rb index 076d9cd..8db238a 100644 --- a/spec/classes/tripleo_packages_spec.rb +++ b/spec/classes/tripleo_packages_spec.rb @@ -29,9 +29,8 @@ describe 'tripleo::packages' do } end - it 'should contain correct upgrade ordering' do - is_expected.to contain_exec('package-upgrade').that_comes_before('Service[nova-compute]') - is_expected.to contain_exec('package-upgrade').with(:command => 'yum -y update') + it 'should contain upgrade exec' do + is_expected.to contain_exec('package-upgrade').with(:command => 'yum -y update') end end diff --git a/spec/classes/tripleo_profile_base_aodh_spec.rb b/spec/classes/tripleo_profile_base_aodh_spec.rb index 10c17eb..dd6554e 100644 --- a/spec/classes/tripleo_profile_base_aodh_spec.rb +++ b/spec/classes/tripleo_profile_base_aodh_spec.rb @@ -39,7 +39,7 @@ describe 'tripleo::profile::base::aodh' do it 'should trigger complete configuration' do is_expected.to contain_class('aodh').with( - :rabbit_hosts => params[:rabbit_hosts] + :rabbit_hosts => params[:rabbit_hosts].map { |h| h + ":5672" } ) is_expected.to contain_class('aodh::auth') is_expected.to contain_class('aodh::config') @@ -72,7 +72,7 @@ describe 'tripleo::profile::base::aodh' do it 'should trigger aodh configuration without mysql grant' do is_expected.to contain_class('aodh').with( - :rabbit_hosts => params[:rabbit_hosts] + :rabbit_hosts => params[:rabbit_hosts].map { |h| h + ":5672" } ) is_expected.to contain_class('aodh::auth') is_expected.to contain_class('aodh::config') diff --git a/spec/classes/tripleo_profile_base_ceilometer_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_spec.rb index 73fb41b..5510f4b 100644 --- a/spec/classes/tripleo_profile_base_ceilometer_spec.rb +++ b/spec/classes/tripleo_profile_base_ceilometer_spec.rb @@ -35,7 +35,7 @@ describe 'tripleo::profile::base::ceilometer' do it 'should trigger complete configuration' do is_expected.to contain_class('ceilometer').with( - :rabbit_hosts => params[:rabbit_hosts] + :rabbit_hosts => params[:rabbit_hosts].map{ |h| h + ':5672' } ) is_expected.to contain_class('ceilometer::config') end |