aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-21 13:53:48 +0000
committerGerrit Code Review <review@openstack.org>2016-12-21 13:53:48 +0000
commit64d720a40d19948f51ebdca59557b8b95f74dd65 (patch)
tree57341c184b65400e14a145ee007db75433df60c0
parent6ec44d98b4a9aee3b469f31d08dd293bcff6db0e (diff)
parentd49173b9be2b651ddd1cf677184c537e3b14e664 (diff)
Merge "Synchronize NetworkDeployment inputs for generic roles"
-rw-r--r--puppet/role.role.j2.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 1f43277..acb7677 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -28,6 +28,10 @@ parameters:
constraints:
- custom_constraint: nova.keypair
{% endif %}
+ NeutronPublicInterface:
+ default: nic1
+ description: What interface to bridge onto br-ex for network nodes.
+ type: string
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@ -351,6 +355,9 @@ resources:
config: {get_resource: NetworkConfig}
server: {get_resource: {{role}}}
actions: {get_param: NetworkDeploymentActions}
+ input_values:
+ bridge_name: br-ex
+ interface_name: {get_param: NeutronPublicInterface}
{{role}}UpgradeInitConfig:
type: OS::Heat::SoftwareConfig