Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add os-collect-config data as an output"
[apex-tripleo-heat-templates.git]
/
puppet
/
controller-role.yaml
diff --git
a/puppet/controller-role.yaml
b/puppet/controller-role.yaml
index
0b76332
..
d095e86
100644
(file)
--- a/
puppet/controller-role.yaml
+++ b/
puppet/controller-role.yaml
@@
-58,9
+58,13
@@
parameters:
type: string
constraints:
- custom_constraint: nova.keypair
type: string
constraints:
- custom_constraint: nova.keypair
+ NeutronPhysicalBridge:
+ default: 'br-ex'
+ description: An OVS bridge to create for accessing external networks.
+ type: string
NeutronPublicInterface:
default: nic1
NeutronPublicInterface:
default: nic1
- description: Wh
at interface to bridge onto br-ex for network nodes
.
+ description: Wh
ich interface to add to the NeutronPhysicalBridge
.
type: string
ServiceNetMap:
default: {}
type: string
ServiceNetMap:
default: {}
@@
-104,8
+108,8
@@
parameters:
default: 'localdomain'
type: string
description: >
default: 'localdomain'
type: string
description: >
- The DNS domain used for the hosts. This
should match the dhcp_domain
-
configured in the Undercloud neutron. Defaults to localdomain
.
+ The DNS domain used for the hosts. This
must match the
+
overcloud_domain_name configured on the undercloud
.
ControllerServerMetadata:
default: {}
description: >
ControllerServerMetadata:
default: {}
description: >
@@
-431,7
+435,7
@@
resources:
- {get_param: NetworkDeploymentActions}
- []
input_values:
- {get_param: NetworkDeploymentActions}
- []
input_values:
- bridge_name:
br-ex
+ bridge_name:
{get_param: NeutronPhysicalBridge}
interface_name: {get_param: NeutronPublicInterface}
# Resource for site-specific injection of root certificate
interface_name: {get_param: NeutronPublicInterface}
# Resource for site-specific injection of root certificate