diff --git a/manifests/agents/bagpipe.pp b/manifests/agents/bagpipe.pp index dbf041c65..65a136a2d 100644 --- a/manifests/agents/bagpipe.pp +++ b/manifests/agents/bagpipe.pp @@ -135,5 +135,6 @@ class neutron::agents::bagpipe ( enable => $enabled, tag => 'neutron-service', } + Neutron_bgpvpn_bagpipe_config<||> ~> Service['bagpipe-bgp'] } } diff --git a/manifests/agents/bgp_dragent.pp b/manifests/agents/bgp_dragent.pp index 8bb759618..1563b9d3a 100644 --- a/manifests/agents/bgp_dragent.pp +++ b/manifests/agents/bgp_dragent.pp @@ -84,5 +84,6 @@ class neutron::agents::bgp_dragent( enable => $enabled, tag => 'neutron-service', } + Neutron_bgp_dragent_config<||> ~> Service['neutron-bgp-dragent'] } } diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index 49ae56dab..d25274014 100644 --- a/manifests/agents/dhcp.pp +++ b/manifests/agents/dhcp.pp @@ -238,5 +238,6 @@ class neutron::agents::dhcp ( enable => $enabled, tag => 'neutron-service', } + Neutron_dhcp_agent_config<||> ~> Service['neutron-dhcp-service'] } } diff --git a/manifests/agents/l2gw.pp b/manifests/agents/l2gw.pp index 45a490fd2..713bbd27c 100644 --- a/manifests/agents/l2gw.pp +++ b/manifests/agents/l2gw.pp @@ -126,5 +126,6 @@ class neutron::agents::l2gw ( enable => $enabled, tag => 'neutron-service', } + Neutron_l2gw_agent_config<||> ~> Service['neutron-l2gw-agent'] } } diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index 353c7375d..c185b30a5 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -211,5 +211,6 @@ class neutron::agents::l3 ( enable => $enabled, tag => 'neutron-service', } + Neutron_l3_agent_config<||> ~> Service['neutron-l3'] } } diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp index b412c40fe..4f27b9d84 100644 --- a/manifests/agents/metadata.pp +++ b/manifests/agents/metadata.pp @@ -147,5 +147,6 @@ class neutron::agents::metadata ( enable => $enabled, tag => 'neutron-service', } + Neutron_metadata_agent_config<||> ~> Service['neutron-metadata'] } } diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp index 8d3600811..b51c1c016 100644 --- a/manifests/agents/metering.pp +++ b/manifests/agents/metering.pp @@ -119,5 +119,6 @@ class neutron::agents::metering ( enable => $enabled, tag => 'neutron-service', } + Neutron_metering_agent_config<||> ~> Service['neutron-metering-service'] } } diff --git a/manifests/agents/ml2/linuxbridge.pp b/manifests/agents/ml2/linuxbridge.pp index e3ce7719e..c7180fcc1 100644 --- a/manifests/agents/ml2/linuxbridge.pp +++ b/manifests/agents/ml2/linuxbridge.pp @@ -169,5 +169,6 @@ class neutron::agents::ml2::linuxbridge ( enable => $enabled, tag => 'neutron-service', } + Neutron_agent_linuxbridge<||> ~> Service['neutron-plugin-linuxbridge-agent'] } } diff --git a/manifests/agents/ml2/macvtap.pp b/manifests/agents/ml2/macvtap.pp index c75499267..84823b8ca 100644 --- a/manifests/agents/ml2/macvtap.pp +++ b/manifests/agents/ml2/macvtap.pp @@ -81,5 +81,6 @@ class neutron::agents::ml2::macvtap ( enable => $enabled, tag => 'neutron-service', } + Neutron_agent_macvtap<||> ~> Service['neutron-plugin-macvtap-agent'] } } diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp index 366d43d52..f093f55e1 100644 --- a/manifests/agents/ml2/networking_baremetal.pp +++ b/manifests/agents/ml2/networking_baremetal.pp @@ -179,6 +179,7 @@ class neutron::agents::ml2::networking_baremetal ( enable => $enabled, tag => 'neutron-service', } + Ironic_neutron_agent_config<||> ~> Service['ironic-neutron-agent-service'] } } diff --git a/manifests/agents/ml2/ovn.pp b/manifests/agents/ml2/ovn.pp index 2a5522458..7460c054f 100644 --- a/manifests/agents/ml2/ovn.pp +++ b/manifests/agents/ml2/ovn.pp @@ -170,6 +170,7 @@ class neutron::agents::ml2::ovn ( enable => $enabled, tag => 'neutron-service', } + Neutron_agent_ovn<||> ~> Service['neutron-ovn-agent'] Exec['Set OVS Manager'] -> Service['neutron-ovn-agent'] } diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index 084e59cea..d7bdadbb4 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -550,6 +550,7 @@ class neutron::agents::ml2::ovs ( enable => $enabled, tag => ['neutron-service'], } + Neutron_agent_ovs<||> ~> Service['neutron-ovs-agent-service'] if ($facts['os']['family'] == 'Redhat') { # NOTE(tkajinam): The service should not be started in a running system. diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp index 090992da4..8bbffaa1e 100644 --- a/manifests/agents/ml2/sriov.pp +++ b/manifests/agents/ml2/sriov.pp @@ -156,6 +156,7 @@ class neutron::agents::ml2::sriov ( enable => $enabled, tag => 'neutron-service', } + Neutron_sriov_agent_config<||> ~> Service['neutron-sriov-nic-agent-service'] Neutron_agent_sriov_numvfs<||> ~> Service['neutron-sriov-nic-agent-service'] } diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp index 89a4d0c22..789f27afe 100644 --- a/manifests/agents/ovn_metadata.pp +++ b/manifests/agents/ovn_metadata.pp @@ -200,6 +200,7 @@ class neutron::agents::ovn_metadata ( enable => $enabled, tag => 'neutron-service', } + Ovn_metadata_agent_config<||> ~> Service['ovn-metadata'] Exec['Set OVS Manager'] -> Service['ovn-metadata'] } diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp index 4ce19bb7b..bfea3f898 100644 --- a/manifests/agents/vpnaas.pp +++ b/manifests/agents/vpnaas.pp @@ -80,6 +80,10 @@ class neutron::agents::vpnaas ( purge => $purge_config, } + # neutron-vpnaas-agent is not an independent service but is integrated into + # l3 agent. + Neutron_vpnaas_agent_config<||> ~> Service<| title == 'neutron-l3' |> + # The VPNaaS agent loads both neutron.conf and its own file. # This only lists config specific to the agent. neutron.conf supplies # the rest. diff --git a/manifests/deps.pp b/manifests/deps.pp index 8c25fe13d..7dfc6af13 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -33,31 +33,31 @@ class neutron::deps { File<| tag == 'neutron-config-file' |> -> File_line<| tag == 'neutron-file-line' |> # All other inifile providers need to be processed in the config block - Anchor['neutron::config::begin'] -> Neutron_agent_linuxbridge<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_agent_macvtap<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_agent_ovs<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_agent_ovn<||> ~> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_agent_linuxbridge<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_agent_macvtap<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_agent_ovs<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_agent_ovn<||> -> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_api_paste_ini<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_bgpvpn_bagpipe_config<||> ~> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_bgpvpn_bagpipe_config<||> -> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_bgpvpn_service_config<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_sfc_service_config<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_dhcp_agent_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_l2gw_agent_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_l3_agent_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_metadata_agent_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_metering_agent_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_bgp_dragent_config<||> ~> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_dhcp_agent_config<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_l2gw_agent_config<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_l3_agent_config<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_metadata_agent_config<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_metering_agent_config<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_bgp_dragent_config<||> -> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_l2gw_service_config<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_plugin_ml2<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_plugin_nuage<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_plugin_opencontrail<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_sriov_agent_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_vpnaas_agent_config<||> ~> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_sriov_agent_config<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Neutron_vpnaas_agent_config<||> -> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_vpnaas_service_config<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_rootwrap_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Ovn_metadata_agent_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Ironic_neutron_agent_config<||> ~> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Ovn_metadata_agent_config<||> -> Anchor['neutron::config::end'] + Anchor['neutron::config::begin'] -> Ironic_neutron_agent_config<||> -> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_api_uwsgi_config<||> ~> Anchor['neutron::config::end'] # policy config should occur in the config block also.