composable neutron ml2 and ovs agent

Adds new puppet and puppet pacemaker specific services for
the Neutron ml2 configuration and the Ovs agent.

Partially-implements: blueprint composable-services-within-roles

Change-Id: I896e5dfe6fae49371c9fe7f47c4364eb6f621b07

4 files changed, 233 insertions, 0 deletions

diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
new file mode 100644
index 00000000..0e1dbb29
--- /dev/null
+++ b/puppet/services/neutron-ovs-agent.yaml
@@ -0,0 +1,71 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Neutron OVS agent configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  NeutronEnableTunnelling:
+    type: string
+    default: "True"
+  NeutronEnableL2Pop:
+    type: string
+    description: >
+        Enable/disable the L2 population feature in the Neutron agents.
+    default: "False"
+  NeutronBridgeMappings:
+    description: >
+      The OVS logical->physical bridge mappings to use. See the Neutron
+      documentation for details. Defaults to mapping br-ex - the external
+      bridge on hosts - to a physical name 'datacentre' which can be used
+      to create provider networks (and we use this for the default floating
+      network) - if changing this either use different post-install network
+      scripts or be sure to keep 'datacentre' as a mapping network name.
+    type: comma_delimited_list
+    default: "datacentre:br-ex"
+  NeutronTunnelTypes:
+    default: 'vxlan'
+    description: |
+        The tunnel types for the Neutron tenant network.
+    type: comma_delimited_list
+  NeutronAgentExtensions:
+    default: "qos"
+    description: |
+        Comma-separated list of extensions enabled for the Neutron agents.
+    type: comma_delimited_list
+
+resources:
+
+  NeutronBase:
+    type: ./neutron-base.yaml
+
+outputs:
+  role_data:
+    description: Role data for the Neutron OVS agent service.
+    value:
+      config_settings:
+        map_merge:
+          - get_attr: [NeutronBase, role_data, config_settings]
+            neutron::agents::ml2::ovs::enable_tunneling: {get_param: NeutronEnableTunnelling}
+            neutron::agents::ml2::ovs::l2_population: {get_param: NeutronEnableL2Pop}
+            neutron::agents::ml2::ovs::bridge_mappings:
+              str_replace:
+                template: MAPPINGS
+                params:
+                  MAPPINGS: {get_param: NeutronBridgeMappings}
+            neutron::agents::ml2::ovs::tunnel_types:
+              str_replace:
+                template: TYPES
+                params:
+                  TYPES: {get_param: NeutronTunnelTypes}
+            neutron::agents::ml2::ovs::extensions:
+              str_replace:
+                template: AGENT_EXTENSIONS
+                params:
+                  AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
+      step_config: |
+        include ::tripleo::profile::base::neutron::ovs
diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml
new file mode 100644
index 00000000..435a6de0
--- /dev/null
+++ b/puppet/services/neutron-plugin-ml2.yaml
@@ -0,0 +1,109 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Neutron ML2 Plugin configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  NeutronMechanismDrivers:
+    default: 'openvswitch'
+    description: |
+        The mechanism drivers for the Neutron tenant network.
+    type: comma_delimited_list
+  NeutronTypeDrivers:
+    default: "vxlan,vlan,flat,gre"
+    description: |
+        Comma-separated list of network type driver entrypoints to be loaded.
+    type: comma_delimited_list
+  NeutronFlatNetworks:
+    type: comma_delimited_list
+    default: 'datacentre'
+    description: If set, flat networks to configure in neutron plugins.
+  NeutronPluginExtensions:
+    default: "qos,port_security"
+    description: |
+        Comma-separated list of extensions enabled for the Neutron plugin.
+    type: comma_delimited_list
+  NeutronNetworkVLANRanges:
+    default: 'datacentre:1:1000'
+    description: >
+      The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the
+      Neutron documentation for permitted values. Defaults to permitting any
+      VLAN on the 'datacentre' physical network (See NeutronBridgeMappings).
+    type: comma_delimited_list
+  NeutronTunnelIdRanges:
+    description: |
+        Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges
+        of GRE tunnel IDs that are available for tenant network allocation
+    default: ["1:4094", ]
+    type: comma_delimited_list
+  NeutronVniRanges:
+    description: |
+        Comma-separated list of <vni_min>:<vni_max> tuples enumerating ranges
+        of VXLAN VNI IDs that are available for tenant network allocation
+    default: ["1:4094", ]
+    type: comma_delimited_list
+  NeutronNetworkType:
+    default: 'vxlan'
+    description: The tenant network type for Neutron.
+    type: comma_delimited_list
+
+resources:
+
+  NeutronBase:
+    type: ./neutron-base.yaml
+
+outputs:
+  role_data:
+    description: Role data for the Neutron ML2 plugin.
+    value:
+      config_settings:
+        map_merge:
+          - get_attr: [NeutronBase, role_data, config_settings]
+          - neutron::plugins::ml2::mechanism_drivers:
+              str_replace:
+                template: MECHANISMS
+                params:
+                  MECHANISMS: {get_param: NeutronMechanismDrivers}
+            neutron::plugins::ml2::type_drivers:
+              str_replace:
+                template: DRIVERS
+                params:
+                  DRIVERS: {get_param: NeutronTypeDrivers}
+            neutron::plugins::ml2::flat_networks:
+              str_replace:
+                template: NETWORKS
+                params:
+                  NETWORKS: {get_param: NeutronFlatNetworks}
+            neutron::plugins::ml2::extension_drivers:
+              str_replace:
+                template: PLUGIN_EXTENSIONS
+                params:
+                  PLUGIN_EXTENSIONS: {get_param: NeutronPluginExtensions}
+            neutron::plugins::ml2::network_vlan_ranges:
+              str_replace:
+                template: RANGES
+                params:
+                  RANGES: {get_param: NeutronNetworkVLANRanges}
+            neutron::plugins::ml2::tunnel_id_ranges:
+              str_replace:
+                template: RANGES
+                params:
+                  RANGES: {get_param: NeutronTunnelIdRanges}
+            neutron::plugins::ml2::vni_ranges:
+              str_replace:
+                template: RANGES
+                params:
+                  RANGES: {get_param: NeutronVniRanges}
+            neutron::plugins::ml2::tenant_network_types:
+              str_replace:
+                template: TYPES
+                params:
+                  TYPES: {get_param: NeutronNetworkType}
+
+      step_config: |
+        include ::tripleo::profile::base::neutron::ml2
diff --git a/puppet/services/pacemaker/neutron-ovs-agent.yaml b/puppet/services/pacemaker/neutron-ovs-agent.yaml
new file mode 100644
index 00000000..a17d7a61
--- /dev/null
+++ b/puppet/services/pacemaker/neutron-ovs-agent.yaml
@@ -0,0 +1,25 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Neutron OVS agent with Pacemaker configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+
+  NeutronOvsBase:
+    type: ../neutron-ovs-agent.yaml
+
+outputs:
+  role_data:
+    description: Role data for the Neutron OVS agent service.
+    value:
+      config_settings:
+        get_attr: [NeutronOvsBase, role_data, config_settings]
+      step_config: |
+        include ::tripleo::profile::pacemaker::neutron::ovs
diff --git a/puppet/services/pacemaker/neutron-plugin-ml2.yaml b/puppet/services/pacemaker/neutron-plugin-ml2.yaml
new file mode 100644
index 00000000..ac9d2402
--- /dev/null
+++ b/puppet/services/pacemaker/neutron-plugin-ml2.yaml
@@ -0,0 +1,28 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Neutron ML2 Plugin with Pacemaker configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+
+  NeutronMl2Base:
+    type: ../neutron-plugin-ml2.yaml
+
+outputs:
+  role_data:
+    description: Role data for the Neutron ML2 plugin.
+    value:
+      config_settings:
+        map_merge:
+          - get_attr: [NeutronMl2Base, role_data, config_settings]
+          - neutron::agents::ml2::ovs::enabled: false
+            neutron::agents::ml2::ovs::manage_service: false
+      step_config: |
+        include ::tripleo::profile::pacemaker::neutron::ml2