diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/heat.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/nova.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/nova/api.pp | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index c743ce0..6e7e5f6 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -59,9 +59,7 @@ class tripleo::profile::base::heat ( manage_user => false, manage_role => false, } - } - if $step >= 4 { $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}") class { '::heat' : notification_driver => $notification_driver, diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 63adbef..dae627c 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -87,7 +87,7 @@ class tripleo::profile::base::nova ( $memcache_servers = suffix(hiera('memcached_node_ips'), ':11211') } - if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) { + if $step >= 4 or ($step >= 3 and $sync_db) { $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($messaging_use_ssl))) # TODO(ccamacho): remove sprintf once we properly type the port, needs # to be a string for the os_transport_url function. diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp index b4e3d74..8ded3ef 100644 --- a/manifests/profile/base/nova/api.pp +++ b/manifests/profile/base/nova/api.pp @@ -92,16 +92,18 @@ class tripleo::profile::base::nova::api ( $messaging_port_real = sprintf('%s', $::tripleo::profile::base::nova::messaging_port) $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($::tripleo::profile::base::nova::messaging_use_ssl))) - class { '::nova::db::sync_cell_v2': - transport_url => os_transport_url({ - 'transport' => $::tripleo::profile::base::nova::messaging_driver, - 'hosts' => $messaging_hosts_real, - 'port' => $messaging_port_real, - 'username' => $::tripleo::profile::base::nova::messaging_username, - 'password' => $::tripleo::profile::base::nova::messaging_password, - 'ssl' => $messaging_use_ssl_real, - }), - } + #TODO(emilien): enable it again when it's fixed upstream in nova + # https://bugs.launchpad.net/tripleo/+bug/1649341 + # class { '::nova::db::sync_cell_v2': + # transport_url => os_transport_url({ + # 'transport' => $::tripleo::profile::base::nova::messaging_driver, + # 'hosts' => $messaging_hosts_real, + # 'port' => $messaging_port_real, + # 'username' => $::tripleo::profile::base::nova::messaging_username, + # 'password' => $::tripleo::profile::base::nova::messaging_password, + # 'ssl' => $messaging_use_ssl_real, + # }), + # } } if $step >= 4 or ($step >= 3 and $sync_db) { |