openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Composable neutron nuage plugin"

Browse Source
This commit is contained in:
Jenkins 2016-06-21 08:57:50 +00:00 committed by Gerrit Code Review
commit 2059931c70
7 changed files with 61 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/neutron-nuage-config.yaml
View File

@ -5,6 +5,8 @@ resource_registry:
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
# Override the NeutronCorePlugin to use Nuage
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginNuage
parameter_defaults:
NeutronNuageOSControllerIp: '0.0.0.0'

2
environments/puppet-pacemaker.yaml
View File

@ -26,7 +26,7 @@ resource_registry:
OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/pacemaker/neutron-plugin-ml2.yaml
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
OS::TripleO::Services::NeutronCorePluginPlumgrid: ../puppet/services/pacemaker/neutron-plugin-plumgrid.yaml
OS::TripleO::Services::NeutronCorePluginNuage: ../puppet/services/pacemaker/neutron-plugin-nuage.yaml
OS::TripleO::Services::NeutronOvsAgent: ../puppet/services/pacemaker/neutron-ovs-agent.yaml
OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml

2
overcloud-resource-registry-puppet.yaml
View File

@ -139,7 +139,7 @@ resource_registry:
OS::TripleO::Services::NeutronCorePlugin: puppet/services/neutron-plugin-ml2.yaml
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
OS::TripleO::Services::NeutronCorePluginPlumgrid: puppet/services/neutron-plugin-plumgrid.yaml
OS::TripleO::Services::NeutronCorePluginNuage: puppet/services/neutron-plugin-nuage.yaml
OS::TripleO::Services::NeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml
OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml

8
puppet/manifests/overcloud_controller.pp
View File

@ -202,12 +202,10 @@ if hiera('step') >= 4 {
}
# If the value of core plugin is set to 'nuage' or'opencontrail'
# include nuage or opencontrail core plugins
# If the value of core plugin is set to 'opencontrail'
# include opencontrail core plugins
# else use the default value of 'ml2'
if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
include ::neutron::plugins::nuage
} elsif hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
include ::neutron::plugins::opencontrail
} else {

3
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -400,9 +400,6 @@ MYSQL_HOST=localhost\n",
}
if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
include ::neutron::plugins::nuage
}
if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
include ::neutron::plugins::opencontrail
}

26
puppet/services/neutron-plugin-nuage.yaml Normal file
View File

@ -0,0 +1,26 @@
heat_template_version: 2016-04-08
description: >
OpenStack Neutron Nuage plugin
parameters:
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
resources:
NeutronBase:
type: ./neutron-base.yaml
outputs:
role_data:
description: Role data for the Neutron Nuage plugin
value:
config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]
step_config: |
include tripleo::profile::base::neutron::plugins::nuage

28
puppet/services/pacemaker/neutron-plugin-nuage.yaml Normal file
View File

@ -0,0 +1,28 @@
heat_template_version: 2016-04-08
description: >
OpenStack Neutron Nuage 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:
NeutronPluginNuageBase:
type: ../neutron-plugin-nuage.yaml
properties:
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
description: Role data for the Neutron Nuage plugin.
value:
config_settings:
map_merge:
- get_attr: [NeutronPluginNuageBase, role_data, config_settings]
step_config: |
include ::tripleo::profile::pacemaker::neutron::plugins::nuage