openstack/tripleo-heat-templates
Code Issues Proposed changes

Parameterizing Puppet Tags

Browse Source 
This commit will also provide third party vendors an option
to pass all the puppet tags that will configure the files needed
to enable their plugin.

Change-Id: I60feb19bf65aef82cfa56822e8ef79f13f70913d
This commit is contained in:
Sai Ram Peesapati 2018-03-29 00:37:57 -04:00
parent bcb3c24461
commit fa3c8222f4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/services/neutron-plugin-ml2.yaml
View File

@ -36,6 +36,10 @@ parameters:
type: boolean
description: Flag to indicate undercloud upgrade process is being run.
default: false
NeutronPluginMl2PuppetTags:
default: 'neutron_plugin_ml2'
description: Puppet resource tag names that are used to generate config files with puppet
type: string
resources:
@ -65,7 +69,7 @@ outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: 'neutron'
puppet_tags: neutron_plugin_ml2
puppet_tags: {get_param: NeutronPluginMl2PuppetTags}
step_config:
get_attr: [NeutronBase, role_data, step_config]
config_image: {get_param: DockerNeutronConfigImage}

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

@ -7,7 +7,7 @@ resource_registry:
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
# Override the NeutronCorePlugin to use Nuage
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Nuage
OS::TripleO::Docker::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
parameter_defaults:
NeutronNuageNetPartitionName: 'default_name'
@ -18,6 +18,7 @@ parameter_defaults:
NeutronNuageBaseURIVersion: 'default_uri_version'
NeutronNuageCMSId: ''
UseForwardedFor: true
NeutronPluginMl2PuppetTags: 'neutron_plugin_ml2,neutron_plugin_nuage'
NeutronServicePlugins: ''
NeutronDBSyncExtraParams: '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini'
NeutronTypeDrivers: ''