openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Synchronize NetworkDeployment inputs for generic roles"

Browse Source
This commit is contained in:
Jenkins 2016-12-21 13:53:48 +00:00 committed by Gerrit Code Review
commit 64d720a40d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
puppet/role.role.j2.yaml
View File

@ -28,6 +28,10 @@ parameters:
constraints: constraints:
- custom_constraint: nova.keypair - custom_constraint: nova.keypair
{% endif %} {% endif %}
NeutronPublicInterface:
default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
ServiceNetMap: ServiceNetMap:
default: {} default: {}
description: Mapping of service_name -> network name. Typically set description: Mapping of service_name -> network name. Typically set
@ -351,6 +355,9 @@ resources:
config: {get_resource: NetworkConfig} config: {get_resource: NetworkConfig}
server: {get_resource: {{role}}} server: {get_resource: {{role}}}
actions: {get_param: NetworkDeploymentActions} actions: {get_param: NetworkDeploymentActions}
input_values:
bridge_name: br-ex
interface_name: {get_param: NeutronPublicInterface}
{{role}}UpgradeInitConfig: {{role}}UpgradeInitConfig:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig