From 98a5f3a6c6d7adc305d643a033a083faa62fcb0a Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Wed, 21 Mar 2018 18:51:59 +0100 Subject: [PATCH] Containerize Neutron LBaaS service plugin In Rocky, environment files in environments/services directory defaulted to containerized deployments and the baremetal ones were moved to environments/services-baremetal. This backport patch moves environment files back so that they can be compatible with Queens. Depends-On: https://review.openstack.org/#/c/563214/ Change-Id: I68e5ca5a78a2bd08082a494b636c6e2debb6bbae (cherry picked from commit 9526cef547278a53c237f08c5b5e79948fc031dd) --- .../deployed-server-roles-data.yaml | 1 + docker/services/neutron-lbaas-api.yaml | 66 +++++++++++++++++++ .../services-docker/neutron-lbaasv2.yaml | 7 ++ environments/services/neutron-lbaasv2.yaml | 3 +- overcloud-resource-registry-puppet.j2.yaml | 1 + ...on-lbaas.yaml => neutron-lbaas-agent.yaml} | 21 +----- puppet/services/neutron-lbaas-api.yaml | 56 ++++++++++++++++ ...lbaas-service-plugin-20562487d6631c88.yaml | 5 ++ roles/Controller.yaml | 1 + roles/ControllerAllNovaStandalone.yaml | 1 + roles/ControllerNoCeph.yaml | 1 + roles/ControllerNovaStandalone.yaml | 1 + roles/ControllerOpenstack.yaml | 1 + roles/ControllerStorageNfs.yaml | 1 + roles_data.yaml | 1 + 15 files changed, 148 insertions(+), 19 deletions(-) create mode 100644 docker/services/neutron-lbaas-api.yaml create mode 100644 environments/services-docker/neutron-lbaasv2.yaml rename puppet/services/{neutron-lbaas.yaml => neutron-lbaas-agent.yaml} (68%) create mode 100644 puppet/services/neutron-lbaas-api.yaml create mode 100644 releasenotes/notes/containerize-neutron-lbaas-service-plugin-20562487d6631c88.yaml diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml index cbfc4c2b74..f9d87c4acf 100644 --- a/deployed-server/deployed-server-roles-data.yaml +++ b/deployed-server/deployed-server-roles-data.yaml @@ -111,6 +111,7 @@ - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLbaasv2Agent + - OS::TripleO::Services::NeutronLbaasv2Api - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronML2FujitsuCfab diff --git a/docker/services/neutron-lbaas-api.yaml b/docker/services/neutron-lbaas-api.yaml new file mode 100644 index 0000000000..d9658375bd --- /dev/null +++ b/docker/services/neutron-lbaas-api.yaml @@ -0,0 +1,66 @@ +heat_template_version: queens + +description: > + Containerized LBaaS 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 + + NeutronLbaasBase: + type: ../../puppet/services/neutron-lbaas-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 LBaaS role. + value: + service_name: {get_attr: [NeutronLbaasBase, role_data, service_name]} + config_settings: {get_attr: [NeutronLbaasBase, role_data, config_settings]} + service_config_settings: {get_attr: [NeutronLbaasBase, role_data, service_config_settings]} + puppet_config: + config_volume: 'neutron' + puppet_tags: neutron_lbaas_service_config + step_config: + get_attr: [NeutronLbaasBase, role_data, step_config] + config_image: {get_param: DockerNeutronConfigImage} + kolla_config: {} + docker_config: {} diff --git a/environments/services-docker/neutron-lbaasv2.yaml b/environments/services-docker/neutron-lbaasv2.yaml new file mode 100644 index 0000000000..dc6bf69745 --- /dev/null +++ b/environments/services-docker/neutron-lbaasv2.yaml @@ -0,0 +1,7 @@ +# A Heat environment file that can be used to deploy Neutron LBaaSv2 service +resource_registry: + OS::TripleO::Services::NeutronLbaasv2Api: ../../docker/services/neutron-lbaas-api.yaml + +parameter_defaults: + NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default'] + NeutronServicePlugins: "qos,router,trunk,lbaasv2" diff --git a/environments/services/neutron-lbaasv2.yaml b/environments/services/neutron-lbaasv2.yaml index ffd835ecd7..8d32d1b0f1 100644 --- a/environments/services/neutron-lbaasv2.yaml +++ b/environments/services/neutron-lbaasv2.yaml @@ -8,7 +8,8 @@ # - OVS: neutron.agent.linux.interface.OVSInterfaceDriver # - LinuxBridges: neutron.agent.linux.interface.BridgeInterfaceDriver resource_registry: - OS::TripleO::Services::NeutronLbaasv2Agent: ../../puppet/services/neutron-lbaas.yaml + OS::TripleO::Services::NeutronLbaasv2Agent: ../../puppet/services/neutron-lbaas-agent.yaml + OS::TripleO::Services::NeutronLbaasv2Api: ../../puppet/services/neutron-lbaas-api.yaml parameter_defaults: NeutronLbaasInterfaceDriver: "neutron.agent.linux.interface.OVSInterfaceDriver" diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 2a93cdbbca..e58fea7b38 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -149,6 +149,7 @@ resource_registry: OS::TripleO::Services::NeutronL3Agent: docker/services/neutron-l3.yaml OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None OS::TripleO::Services::NeutronLbaasv2Agent: OS::Heat::None + OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: docker/services/neutron-metadata.yaml OS::TripleO::Services::OVNMetadataAgent: OS::Heat::None # FIXME(shardy) the duplicate NeutronServer line can be removed when we've updated diff --git a/puppet/services/neutron-lbaas.yaml b/puppet/services/neutron-lbaas-agent.yaml similarity index 68% rename from puppet/services/neutron-lbaas.yaml rename to puppet/services/neutron-lbaas-agent.yaml index b7c897b157..963afcc1cb 100644 --- a/puppet/services/neutron-lbaas.yaml +++ b/puppet/services/neutron-lbaas-agent.yaml @@ -1,7 +1,7 @@ heat_template_version: queens description: > - Neutron LBaaS service configured with Puppet + Neutron LBaaS agent configured with Puppet parameters: ServiceData: @@ -40,15 +40,6 @@ parameters: default: false type: boolean description: Uses veth for an interface or not - NeutronServiceProviders: - default: 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default' - description: Global list of service providers used by neutron. This - list should be passed in to ensure all service - providers desired by the user are included. The - provided default value only set the provider for the LBaaSv2 - subsystem.This is currently incompatible with enabling - octavia-api as one service or the other will break because the defaults are different. - type: comma_delimited_list resources: @@ -66,7 +57,7 @@ outputs: role_data: description: Role data for the Neutron LBaaS role. value: - service_name: neutron_lbaas + service_name: neutron_lbaas_agent config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] @@ -74,12 +65,6 @@ outputs: neutron::agents::lbaas::device_driver: {get_param: NeutronLbaasDeviceDriver} neutron::agents::lbaas::ovs_use_veth: {get_param: NeutronLbaasOvsUseVeth} step_config: | - include ::tripleo::profile::base::neutron::lbaas - service_config_settings: - neutron_api: - neutron::server::service_providers: {get_param: NeutronServiceProviders} - horizon: - horizon::neutron_options: - enable_lb: True + include ::tripleo::profile::base::neutron::agents::lbaas metadata_settings: get_attr: [NeutronBase, role_data, metadata_settings] diff --git a/puppet/services/neutron-lbaas-api.yaml b/puppet/services/neutron-lbaas-api.yaml new file mode 100644 index 0000000000..34b3eced1f --- /dev/null +++ b/puppet/services/neutron-lbaas-api.yaml @@ -0,0 +1,56 @@ +heat_template_version: queens + +description: > + Neutron LBaaS service plugin 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 + NeutronServiceProviders: + default: 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default' + description: Global list of service providers used by neutron. This + list should be passed in to ensure all service + providers desired by the user are included. The + provided default value only set the provider for the LBaaSv2 + subsystem.This is currently incompatible with enabling + octavia-api as one service or the other will break because the defaults are different. + type: comma_delimited_list + + +outputs: + role_data: + description: Role data for the Neutron LBaaS role. + value: + service_name: neutron_lbaas_api + step_config: | + include ::tripleo::profile::base::neutron::lbaas + service_config_settings: + neutron_api: + neutron::server::service_providers: {get_param: NeutronServiceProviders} + horizon: + horizon::neutron_options: + enable_lb: True diff --git a/releasenotes/notes/containerize-neutron-lbaas-service-plugin-20562487d6631c88.yaml b/releasenotes/notes/containerize-neutron-lbaas-service-plugin-20562487d6631c88.yaml new file mode 100644 index 0000000000..8147ac45e2 --- /dev/null +++ b/releasenotes/notes/containerize-neutron-lbaas-service-plugin-20562487d6631c88.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Add support for Neutron LBaaSV2 service plugin in a containerized + deployment. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index e8266d34ab..f50014e291 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -119,6 +119,7 @@ - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLbaasv2Agent + - OS::TripleO::Services::NeutronLbaasv2Api - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronML2FujitsuCfab diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index a25f060282..9c9a8087ef 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -89,6 +89,7 @@ - OS::TripleO::Services::NeutronSfcApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronL2gwApi + - OS::TripleO::Services::NeutronLbaasv2Api - OS::TripleO::Services::NovaIronic - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 6a95d43a75..5530cefdcc 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -112,6 +112,7 @@ - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLbaasv2Agent + - OS::TripleO::Services::NeutronLbaasv2Api - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronML2FujitsuCfab diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index c3386b1880..ad14d65963 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -104,6 +104,7 @@ - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLbaasv2Agent + - OS::TripleO::Services::NeutronLbaasv2Api - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronML2FujitsuCfab diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 8702a71729..716735ed53 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -94,6 +94,7 @@ - OS::TripleO::Services::NeutronSfcApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronL2gwApi + - OS::TripleO::Services::NeutronLbaasv2Api - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaConsoleauth diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index db039cd41e..c39ede63a6 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -109,6 +109,7 @@ - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLbaasv2Agent + - OS::TripleO::Services::NeutronLbaasv2Api - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronML2FujitsuCfab diff --git a/roles_data.yaml b/roles_data.yaml index 026170ccdb..37d931db66 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -122,6 +122,7 @@ - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLbaasv2Agent + - OS::TripleO::Services::NeutronLbaasv2Api - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronML2FujitsuCfab