diff options
Diffstat (limited to 'manifests/profile/base/neutron')
| -rw-r--r-- | manifests/profile/base/neutron/opendaylight.pp | 4 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/opendaylight/create_cluster.pp | 4 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/server.pp | 12 |
3 files changed, 11 insertions, 9 deletions
diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp index 5d25ae2..7a35b6b 100644 --- a/manifests/profile/base/neutron/opendaylight.pp +++ b/manifests/profile/base/neutron/opendaylight.pp @@ -28,12 +28,12 @@ # # [*node_name*] # (Optional) The short hostname of node -# Defaults to hiera('bootstack_nodeid') +# Defaults to hiera('bootstrap_nodeid') # class tripleo::profile::base::neutron::opendaylight ( $step = Integer(hiera('step')), $odl_api_ips = hiera('opendaylight_api_node_ips'), - $node_name = hiera('bootstack_nodeid') + $node_name = hiera('bootstrap_nodeid') ) { if $step >= 1 { diff --git a/manifests/profile/base/neutron/opendaylight/create_cluster.pp b/manifests/profile/base/neutron/opendaylight/create_cluster.pp index c3e4f7f..94cd898 100644 --- a/manifests/profile/base/neutron/opendaylight/create_cluster.pp +++ b/manifests/profile/base/neutron/opendaylight/create_cluster.pp @@ -28,11 +28,11 @@ # # [*node_name*] # (Optional) The short hostname of node -# Defaults to hiera('bootstack_nodeid') +# Defaults to hiera('bootstrap_nodeid') # class tripleo::profile::base::neutron::opendaylight::create_cluster ( $odl_api_ips = hiera('opendaylight_api_node_ips'), - $node_name = hiera('bootstack_nodeid') + $node_name = hiera('bootstrap_nodeid') ) { tripleo::profile::base::neutron::opendaylight::configure_cluster {'ODL cluster': diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp index 0dee53e..60ef443 100644 --- a/manifests/profile/base/neutron/server.pp +++ b/manifests/profile/base/neutron/server.pp @@ -113,10 +113,7 @@ class tripleo::profile::base::neutron::server ( $l3_ha = false } - # We start neutron-server on the bootstrap node first, because - # it will try to populate tables and we need to make sure this happens - # before it starts on other nodes - if $step >= 4 and $sync_db or $step >= 5 and !$sync_db { + if $step >= 4 or ($step >= 3 and $sync_db) { if $enable_internal_tls { if !$neutron_network { fail('neutron_api_network is not set in the hieradata.') @@ -130,9 +127,14 @@ class tripleo::profile::base::neutron::server ( port => $tls_proxy_port, tls_cert => $tls_certfile, tls_key => $tls_keyfile, - notify => Class['::neutron::server'], } + Tripleo::Tls_proxy['neutron-api'] ~> Anchor<| title == 'neutron::service::begin' |> } + } + # We start neutron-server on the bootstrap node first, because + # it will try to populate tables and we need to make sure this happens + # before it starts on other nodes + if $step >= 4 and $sync_db or $step >= 5 and !$sync_db { include ::neutron::server::notifications # We need to override the hiera value neutron::server::sync_db which is set |