summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-20 18:55:45 +0000
committerGerrit Code Review <review@openstack.org>2014-06-20 18:55:45 +0000
commitb5b85036c4c514d75dfec63b5f87dcd9d497ee79 (patch)
tree95913d35812cca0d9626f8cf6432b7d7f46c06e7
parent36ff86ceb4e1f0a6a909e8c8a0f5cae9b2e7487a (diff)
parentb08bb1cf49e67ad1db966ebefefef0aa3a8d4a78 (diff)
Merge "Add custom public IP support to the undercloud."
-rw-r--r--undercloud-source.yaml19
1 files changed, 19 insertions, 0 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 7206c67c..ee8cf0b1 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -120,6 +120,18 @@ Parameters:
Description: The password for the nova service account, used by nova-api.
Type: String
NoEcho: true
+ NeutronPublicInterfaceDefaultRoute:
+ Default: ''
+ Description: A custom default route for the NeutronPublicInterface.
+ Type: String
+ NeutronPublicInterfaceIP:
+ Default: ''
+ Description: A custom IP address to put onto the NeutronPublicInterface.
+ Type: String
+ NeutronPublicInterfaceRawDevice:
+ Default: ''
+ Description: If set, the public interface is a vlan with this device as the raw device.
+ Type: String
NtpServer:
Type: String
Default: ''
@@ -178,6 +190,9 @@ Resources:
- undercloud
- show
nodeid: {get_input: bootstack_nodeid}
+ bootstack:
+ public_interface_ip:
+ Ref: NeutronPublicInterfaceIP
controller-address:
get_input: controller_host
ceilometer:
@@ -222,6 +237,10 @@ Resources:
ovs:
public_interface:
Ref: NeutronPublicInterface
+ public_interface_raw_device:
+ Ref: NeutronPublicInterfaceRawDevice
+ public_interface_route:
+ Ref: NeutronPublicInterfaceDefaultRoute
physical_bridge: br-ctlplane
physical_network: ctlplane
network_vlan_ranges: ctlplane