diff options
Diffstat (limited to 'manifests/profile/base/neutron')
| -rw-r--r-- | manifests/profile/base/neutron/dhcp.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/l3.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/metadata.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/ovs.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/server.pp | 12 |
5 files changed, 4 insertions, 68 deletions
diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp index 4d5bb28..180fd37 100644 --- a/manifests/profile/base/neutron/dhcp.pp +++ b/manifests/profile/base/neutron/dhcp.pp @@ -22,14 +22,6 @@ # (Optional) # Defaults to hiera('neutron_dnsmasq_options') # -# [*enabled*] -# (Optional) Whether to enable the Neutron DHCP Agent service -# Defaults to undef -# -# [*manage_service*] -# (Optional) Whether to manage the Neutron DHCP Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -37,16 +29,11 @@ # class tripleo::profile::base::neutron::dhcp ( $neutron_dnsmasq_options = hiera('neutron_dnsmasq_options', ''), - $enabled = undef, - $manage_service = undef, $step = hiera('step'), ) { if $step >= 4 { include ::tripleo::profile::base::neutron - class { '::neutron::agents::dhcp': - manage_service => $manage_service, - enabled => $enabled - } + include ::neutron::agents::dhcp file { '/etc/neutron/dnsmasq-neutron.conf': content => $neutron_dnsmasq_options, diff --git a/manifests/profile/base/neutron/l3.pp b/manifests/profile/base/neutron/l3.pp index f96833a..2b57555 100644 --- a/manifests/profile/base/neutron/l3.pp +++ b/manifests/profile/base/neutron/l3.pp @@ -22,30 +22,17 @@ # (Optional) Whether to set ovs_use_veth (for older kernel support) # Defaults to hiera('neutron_ovs_use_veth', false) # -# [*enabled*] -# (Optional) Whether to enable the Neutron L3 Agent service -# Defaults to undef -# -# [*manage_service*] -# (Optional) Whether to manage the Neutron L3 Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::base::neutron::l3 ( - $enabled = undef, - $manage_service = undef, $step = hiera('step'), ) { if $step >= 4 { include ::tripleo::profile::base::neutron - class { '::neutron::agents::l3': - manage_service => $manage_service, - enabled => $enabled - } + include ::neutron::agents::l3 Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-l3' |> } diff --git a/manifests/profile/base/neutron/metadata.pp b/manifests/profile/base/neutron/metadata.pp index bdad751..d7b4c99 100644 --- a/manifests/profile/base/neutron/metadata.pp +++ b/manifests/profile/base/neutron/metadata.pp @@ -18,30 +18,17 @@ # # === Parameters # -# [*enabled*] -# (Optional) Whether to enable the Neutron Metadata Agent service -# Defaults to undef -# -# [*manage_service*] -# (Optional) Whether to manage the Neutron Metadata Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::base::neutron::metadata ( - $enabled = undef, - $manage_service = undef, $step = hiera('step'), ) { if $step >= 4 { include ::tripleo::profile::base::neutron - class { '::neutron::agents::metadata': - manage_service => $manage_service, - enabled => $enabled - } + include ::neutron::agents::metadata Service<| title == 'neutron-server' |> -> Service<| title == 'neutron-metadata' |> } diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp index 783952b..f801511 100644 --- a/manifests/profile/base/neutron/ovs.pp +++ b/manifests/profile/base/neutron/ovs.pp @@ -18,32 +18,19 @@ # # === Parameters # -# [*manage_service*] -# (Optional) Whether to manage the Neutron OVS Agent service -# Defaults to undef -# -# [*enabled*] -# (Optional) Whether to enable the Neutron OVS Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::base::neutron::ovs( - $manage_service = undef, - $enabled = undef, $step = hiera('step'), ) { include ::tripleo::profile::base::neutron if $step >= 4 { - class { '::neutron::agents::ml2::ovs': - manage_service => $manage_service, - enabled => $enabled - } + include ::neutron::agents::ml2::ovs # Optional since manage_service may be false and neutron server may not be colocated. Service<| title == 'neutron-server' |> -> Service<| title == 'neutron-ovs-agent-service' |> diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp index 20127ed..14af56e 100644 --- a/manifests/profile/base/neutron/server.pp +++ b/manifests/profile/base/neutron/server.pp @@ -22,14 +22,6 @@ # (Optional) Whether to run Neutron DB sync operations # Defaults to undef # -# [*manage_service*] -# (Optional) Whether to manage the Neutron Server service -# Defaults to undef -# -# [*enabled*] -# (Optional) Whether to enable the Neutron Server service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -37,8 +29,6 @@ # class tripleo::profile::base::neutron::server ( $sync_db = true, - $manage_service = undef, - $enabled = undef, $step = hiera('step'), ) { @@ -53,8 +43,6 @@ class tripleo::profile::base::neutron::server ( class { '::neutron::server': sync_db => $sync_db, - manage_service => $manage_service, - enabled => $enabled } } } |