diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp index 5edf519dd..cae8cb3b0 100644 --- a/manifests/profile/base/neutron.pp +++ b/manifests/profile/base/neutron.pp @@ -82,10 +82,6 @@ # of available agents. # Defaults to hiera('neutron_dhcp_short_node_names') or [] # -# [*designate_api_enabled*] -# (Optional) Indicate whether Designate is available in the deployment. -# Defaults to hiera('designate_api_enabled') or false -# # [*container_cli*] # (Optional) A container CLI to be used with the wrapper # tooling to manage containers controled by Neutron/OVN @@ -109,7 +105,6 @@ class tripleo::profile::base::neutron ( $oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'), $dhcp_agents_per_network = undef, $dhcp_nodes = hiera('neutron_dhcp_short_node_names', []), - $designate_api_enabled = hiera('designate_api_enabled', false), $container_cli = hiera('container_cli', 'docker'), ) { if $step >= 3 { @@ -160,9 +155,5 @@ class tripleo::profile::base::neutron ( } include ::neutron::config include ::neutron::logging - - if $designate_api_enabled { - include ::neutron::designate - } } } diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp index 33e76e383..e772c1f78 100644 --- a/manifests/profile/base/neutron/server.pp +++ b/manifests/profile/base/neutron/server.pp @@ -82,6 +82,10 @@ # enable_internal_tls is set. # defaults to 9696 # +# [*designate_api_enabled*] +# (Optional) Indicate whether Designate is available in the deployment. +# Defaults to hiera('designate_api_enabled') or false +# class tripleo::profile::base::neutron::server ( $bootstrap_node = hiera('neutron_api_short_bootstrap_node_name', undef), $certificates_specs = hiera('apache_certificates_specs', {}), @@ -94,6 +98,7 @@ class tripleo::profile::base::neutron::server ( $tls_proxy_bind_ip = undef, $tls_proxy_fqdn = undef, $tls_proxy_port = 9696, + $designate_api_enabled = hiera('designate_api_enabled', false), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -130,6 +135,9 @@ class tripleo::profile::base::neutron::server ( } Tripleo::Tls_proxy['neutron-api'] ~> Anchor<| title == 'neutron::service::begin' |> } + if $designate_api_enabled { + include ::neutron::designate + } } # We start neutron-server on the bootstrap node first, because # it will try to populate tables and we need to make sure this happens