summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-10 05:45:33 +0000
committerGerrit Code Review <review@openstack.org>2014-08-10 05:45:33 +0000
commit06fcc32314786feaccae5f67c8fa5940e6dabafe (patch)
tree49b1d9e96161e92425e6088c82c7e77634382474
parenta533b3aecebe86e6f22e690d896856bfb606663b (diff)
parenta5413281e08b7cf9dd4648d4f31b7593d7dd4c0a (diff)
Merge "Fix overcloud controller scaling"
-rw-r--r--overcloud-source.yaml17
-rw-r--r--undercloud-source.yaml13
2 files changed, 24 insertions, 6 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index d6f7eb34..fcfb821f 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -283,10 +283,6 @@ parameters:
description: Keystone key for signing tokens.
type: string
hidden: true
- BootstrapNodeResource:
- default: controller0
- description: Name of the bootstrap controller resource
- type: string
resources:
ControlVirtualIP:
type: OS::Neutron::Port
@@ -364,7 +360,18 @@ resources:
public_interface_ip:
get_param: NeutronPublicInterfaceIP
bootstrap_host:
- bootstrap_nodeid: {get_attr: [{get_param: BootstrapNodeResource}, show, name]}
+ bootstrap_nodeid:
+ Fn::Select:
+ - 0
+ - Fn::Select:
+ - 0
+ - Merge::Map:
+ controller0:
+ - Fn::Select:
+ - name
+ - get_attr:
+ - controller0
+ - show
nodeid: {get_input: bootstack_nodeid}
cinder:
db: mysql://cinder:unset@localhost/cinder
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index a3bba63d..ef8d7cd4 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -198,7 +198,18 @@ resources:
admin-token:
get_param: AdminToken
bootstrap_host:
- bootstrap_nodeid: {get_attr: [undercloud, show, name]}
+ bootstrap_nodeid:
+ Fn::Select:
+ - 0
+ - Fn::Select:
+ - 0
+ - Merge::Map:
+ undercloud:
+ - Fn::Select:
+ - name
+ - get_attr:
+ - undercloud
+ - show
nodeid: {get_input: bootstack_nodeid}
bootstack:
public_interface_ip: