diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 5ccbf0ac85..74ec48dea5 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -17,9 +17,9 @@ resource_registry: # TODO: in Queens, re-add bgp-vpn and l2gw services when # containerized. # https://bugs.launchpad.net/bugs/1713612 - # OS::TripleO::Services::NeutronBgpVpnApi: ../../puppet/services/neutron-bgpvpn-api.yaml - # OS::TripleO::Services::NeutronL2gwApi: ../../puppet/services/neutron-l2gw-api.yaml - # OS::TripleO::Services::NeutronL2gwAgent: ../../puppet/services/neutron-l2gw-agent.yaml + # OS::TripleO::Services::NeutronBgpVpnApi: ../../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml + # OS::TripleO::Services::NeutronL2gwApi: ../../deployment/neutron/neutron-l2gw-api-container-puppet.yaml + # OS::TripleO::Services::NeutronL2gwAgent: ../../deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml # These enable Pacemaker OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml diff --git a/puppet/services/neutron-bgpvpn-api.yaml b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml similarity index 71% rename from puppet/services/neutron-bgpvpn-api.yaml rename to deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml index ed382e1de8..d5d18d6442 100644 --- a/puppet/services/neutron-bgpvpn-api.yaml +++ b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml @@ -30,11 +30,19 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + DockerNeutronConfigImage: + description: The container image to use for the neutron config_volume + type: string BgpvpnServiceProvider: default: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default' description: Backend to use as a service provider for BGPVPN type: string +resources: + + ContainersCommon: + type: ../../docker/services/containers-common.yaml + outputs: role_data: description: Role data for the BGPVPN role. @@ -42,5 +50,12 @@ outputs: service_name: neutron_bgpvpn_api config_settings: neutron::services::bgpvpn::service_providers: {get_param: BgpvpnServiceProvider} - step_config: | - include ::tripleo::profile::base::neutron::bgpvpn + # BEGIN DOCKER SETTING + puppet_config: + config_volume: 'neutron' + puppet_tags: neutron_bgpvpn_service_config + step_config: | + include ::tripleo::profile::base::neutron::bgpvpn + config_image: {get_param: DockerNeutronConfigImage} + kolla_config: {} + docker_config: {} diff --git a/puppet/services/neutron-bgpvpn-bagpipe.yaml b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml similarity index 100% rename from puppet/services/neutron-bgpvpn-bagpipe.yaml rename to deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml diff --git a/puppet/services/neutron-l2gw-agent.yaml b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml similarity index 100% rename from puppet/services/neutron-l2gw-agent.yaml rename to deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml diff --git a/puppet/services/neutron-l2gw-api.yaml b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml similarity index 79% rename from puppet/services/neutron-l2gw-api.yaml rename to deployment/neutron/neutron-l2gw-api-container-puppet.yaml index 39c6505ca4..dec2939cd8 100644 --- a/puppet/services/neutron-l2gw-api.yaml +++ b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml @@ -1,7 +1,7 @@ heat_template_version: rocky description: > - L2 Gateway service plugin configured with Puppet + Containerized L2GW Service Plugin parameters: ServiceData: @@ -30,6 +30,9 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + DockerNeutronConfigImage: + description: The container image to use for the neutron config_volume + type: string L2gwServiceDefaultInterfaceName: default: 'FortyGigE1/0/1' description: default interface name of the L2 gateway @@ -51,6 +54,11 @@ parameters: description: Backend to use as a service provider for L2 Gateway type: comma_delimited_list +resources: + + ContainersCommon: + type: ../../docker/services/containers-common.yaml + outputs: role_data: description: Role data for the L2 Gateway role. @@ -62,5 +70,12 @@ outputs: neutron::services::l2gw::quota_l2_gateway: {get_param: L2gwServiceQuotaL2Gateway} neutron::services::l2gw::periodic_monitoring_interval: {get_param: L2gwServicePeriodicMonitoringInterval} neutron::services::l2gw::service_providers: {get_param: L2gwServiceProvider} - step_config: | - include tripleo::profile::base::neutron::l2gw + # BEGIN DOCKER SETTING + puppet_config: + config_volume: 'neutron' + puppet_tags: neutron_l2gw_service_config + step_config: | + include tripleo::profile::base::neutron::l2gw + config_image: {get_param: DockerNeutronConfigImage} + kolla_config: {} + docker_config: {} diff --git a/docker/services/neutron-bgpvpn-api.yaml b/docker/services/neutron-bgpvpn-api.yaml deleted file mode 100644 index a7f4fb89ef..0000000000 --- a/docker/services/neutron-bgpvpn-api.yaml +++ /dev/null @@ -1,68 +0,0 @@ -heat_template_version: rocky - -description: > - BGPVPN API service configured with Puppet - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - DockerNeutronConfigImage: - description: The container image to use for the neutron config_volume - type: string - -resources: - - ContainersCommon: - type: ./containers-common.yaml - - NeutronBgpVpnBase: - type: ../../puppet/services/neutron-bgpvpn-api.yaml - properties: - EndpointMap: {get_param: EndpointMap} - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the BGPVPN role. - value: - service_name: - get_attr: [NeutronBgpVpnBase, role_data, service_name] - config_settings: - get_attr: [NeutronBgpVpnBase, role_data, config_settings] - # BEGIN DOCKER SETTING - puppet_config: - config_volume: 'neutron' - puppet_tags: neutron_bgpvpn_service_config - step_config: - get_attr: [NeutronBgpVpnBase, role_data, step_config] - config_image: {get_param: DockerNeutronConfigImage} - kolla_config: {} - docker_config: {} diff --git a/docker/services/neutron-l2gw-api.yaml b/docker/services/neutron-l2gw-api.yaml deleted file mode 100644 index e8f214a934..0000000000 --- a/docker/services/neutron-l2gw-api.yaml +++ /dev/null @@ -1,68 +0,0 @@ -heat_template_version: rocky - -description: > - Containerized L2GW Service Plugin - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - DockerNeutronConfigImage: - description: The container image to use for the neutron config_volume - type: string - -resources: - - ContainersCommon: - type: ./containers-common.yaml - - NeutronL2gwBase: - type: ../../puppet/services/neutron-l2gw-api.yaml - properties: - EndpointMap: {get_param: EndpointMap} - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the L2 Gateway role. - value: - service_name: - get_attr: [NeutronL2gwBase, role_data, service_name] - config_settings: - get_attr: [NeutronL2gwBase, role_data, config_settings] - # BEGIN DOCKER SETTING - puppet_config: - config_volume: 'neutron' - puppet_tags: neutron_l2gw_service_config - step_config: - get_attr: [NeutronL2gwBase, role_data, step_config] - config_image: {get_param: DockerNeutronConfigImage} - kolla_config: {} - docker_config: {} diff --git a/environments/neutron-bgpvpn-bagpipe.yaml b/environments/neutron-bgpvpn-bagpipe.yaml index 8264aa2ac8..c085e69b23 100644 --- a/environments/neutron-bgpvpn-bagpipe.yaml +++ b/environments/neutron-bgpvpn-bagpipe.yaml @@ -7,9 +7,8 @@ # in OpenVSwitch. # resource_registry: - OS::TripleO::Services::NeutronBgpVpnApi: ../docker/services/neutron-bgpvpn-api.yaml - # FIXME(bogdando): switch it, once it is containerized - OS::TripleO::Services::NeutronBgpVpnBagpipe: ../puppet/services/neutron-bgpvpn-bagpipe.yaml + OS::TripleO::Services::NeutronBgpVpnApi: ../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml + OS::TripleO::Services::NeutronBgpVpnBagpipe: ../deployment/services/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml parameter_defaults: diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml index 6d4befb1de..a1ee2957f0 100644 --- a/environments/neutron-bgpvpn.yaml +++ b/environments/neutron-bgpvpn.yaml @@ -9,7 +9,7 @@ # - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default # - Nuage: BGPVPN:Nuage:nuage_neutron.bgpvpn.services.service_drivers.driver.NuageBGPVPNDriver:default resource_registry: - OS::TripleO::Services::NeutronBgpVpnApi: ../docker/services/neutron-bgpvpn-api.yaml + OS::TripleO::Services::NeutronBgpVpnApi: ../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml parameter_defaults: NeutronServicePlugins: 'router,bgpvpn' diff --git a/environments/neutron-l2gw.yaml b/environments/neutron-l2gw.yaml index b0c7781c7d..6ec541e99b 100644 --- a/environments/neutron-l2gw.yaml +++ b/environments/neutron-l2gw.yaml @@ -7,9 +7,8 @@ # - L2 gateway agent: L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default # - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default resource_registry: - OS::TripleO::Services::NeutronL2gwApi: ../docker/services/neutron-l2gw-api.yaml - # FIXME(bogdando): switch it, once it is containerized - OS::TripleO::Services::NeutronL2gwAgent: ../puppet/services/neutron-l2gw-agent.yaml + OS::TripleO::Services::NeutronL2gwApi: ../deployment/neutron/neutron-l2gw-api-container-puppet.yaml + OS::TripleO::Services::NeutronL2gwAgent: ../deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml parameter_defaults: NeutronServicePlugins: "l2gw" diff --git a/environments/services-baremetal/neutron-bgpvpn-opendaylight.yaml b/environments/services-baremetal/neutron-bgpvpn-opendaylight.yaml index 2111a41343..5941282efb 100644 --- a/environments/services-baremetal/neutron-bgpvpn-opendaylight.yaml +++ b/environments/services-baremetal/neutron-bgpvpn-opendaylight.yaml @@ -5,7 +5,7 @@ # # - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default resource_registry: - OS::TripleO::Services::NeutronBgpVpnApi: ../../puppet/services/neutron-bgpvpn-api.yaml + OS::TripleO::Services::NeutronBgpVpnApi: ../../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml parameter_defaults: NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn' diff --git a/environments/services-baremetal/neutron-l2gw-opendaylight.yaml b/environments/services-baremetal/neutron-l2gw-opendaylight.yaml index 7d5abf32cf..cd59a3f91e 100644 --- a/environments/services-baremetal/neutron-l2gw-opendaylight.yaml +++ b/environments/services-baremetal/neutron-l2gw-opendaylight.yaml @@ -5,7 +5,7 @@ # # - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default resource_registry: - OS::TripleO::Services::NeutronL2gwApi: ../../puppet/services/neutron-l2gw-api.yaml + OS::TripleO::Services::NeutronL2gwApi: ../../deployment/neutron/neutron-l2gw-api-container-puppet.yaml parameter_defaults: NeutronServicePlugins: "odl-router_v2,trunk,l2gw" diff --git a/environments/services/neutron-bgpvpn-opendaylight.yaml b/environments/services/neutron-bgpvpn-opendaylight.yaml index 220f7850fd..5941282efb 100644 --- a/environments/services/neutron-bgpvpn-opendaylight.yaml +++ b/environments/services/neutron-bgpvpn-opendaylight.yaml @@ -5,7 +5,7 @@ # # - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default resource_registry: - OS::TripleO::Services::NeutronBgpVpnApi: ../../docker/services/neutron-bgpvpn-api.yaml + OS::TripleO::Services::NeutronBgpVpnApi: ../../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml parameter_defaults: NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn' diff --git a/environments/services/neutron-l2gw-opendaylight.yaml b/environments/services/neutron-l2gw-opendaylight.yaml index 4153e79d68..0326970d5e 100644 --- a/environments/services/neutron-l2gw-opendaylight.yaml +++ b/environments/services/neutron-l2gw-opendaylight.yaml @@ -5,7 +5,7 @@ # # - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default resource_registry: - OS::TripleO::Services::NeutronL2gwApi: ../../docker/services/neutron-l2gw-api.yaml + OS::TripleO::Services::NeutronL2gwApi: ../../deployment/neutron/neutron-l2gw-api-container-puppet.yaml parameter_defaults: NeutronServicePlugins: "odl-router_v2,trunk,l2gw"