Containerize Neutron LBaaS service plugin

Change-Id: I68e5ca5a78a2bd08082a494b636c6e2debb6bbae
2018-03-21 18:51:59 +01:00 · 2018-03-21 18:51:59 +01:00 · 9526cef547
parent 628cd0e390
commit 9526cef547
15 changed files with 159 additions and 30 deletions
--- 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
--- a/docker/services/neutron-lbaas-api.yaml
+++ 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: {}
--- a/environments/services-baremetal/neutron-lbaasv2.yaml
+++ b/environments/services-baremetal/neutron-lbaasv2.yaml
@ -0,0 +1,19 @@
+# A Heat environment file that can be used to deploy Neutron LBaaSv2 service
+#
+# Currently there are only two interface drivers for Neutron LBaaSv2
+# The default option is the standard OVS driver the other option is to be used
+# when linux bridges are used instead of OVS
+# In order to enable other backend, replace the content of NeutronLbaasInterfaceDriver
+#
+# - OVS: neutron.agent.linux.interface.OVSInterfaceDriver
+# - LinuxBridges: neutron.agent.linux.interface.BridgeInterfaceDriver
+resource_registry:
+  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"
+  NeutronLbaasDeviceDriver: "neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver"
+  NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default']
+  NeutronServicePlugins: "qos,router,trunk,lbaasv2"
+  NeutronLbaasOvsUseVeth: false
--- a/environments/services/neutron-lbaasv2.yaml
+++ b/environments/services/neutron-lbaasv2.yaml
@ -1,18 +1,7 @@
 # A Heat environment file that can be used to deploy Neutron LBaaSv2 service
-#
-# Currently there are only two interface drivers for Neutron LBaaSv2
-# The default option is the standard OVS driver the other option is to be used
-# when linux bridges are used instead of OVS
-# In order to enable other backend, replace the content of NeutronLbaasInterfaceDriver
-#
-# - 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::NeutronLbaasv2Api: ../../docker/services/neutron-lbaas-api.yaml

 parameter_defaults:
-  NeutronLbaasInterfaceDriver: "neutron.agent.linux.interface.OVSInterfaceDriver"
-  NeutronLbaasDeviceDriver: "neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver"
  NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default']
  NeutronServicePlugins: "qos,router,trunk,lbaasv2"
-  NeutronLbaasOvsUseVeth: false
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -139,6 +139,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
--- a/puppet/services/neutron-lbaas-agent.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]
--- a/puppet/services/neutron-lbaas-api.yaml
+++ 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
--- a/releasenotes/notes/containerize-neutron-lbaas-service-plugin-20562487d6631c88.yaml
+++ 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.
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@ -126,6 +126,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
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/roles/ControllerAllNovaStandalone.yaml
@ -95,6 +95,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
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.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
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@ -105,6 +105,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
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@ -100,6 +100,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
--- a/roles/ControllerStorageNfs.yaml
+++ b/roles/ControllerStorageNfs.yaml
@ -110,6 +110,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
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -129,6 +129,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