Merge "Fix overcloud controller scaling"

This commit is contained in:
Jenkins 2014-08-10 05:45:33 +00:00 committed by Gerrit Code Review
commit 06fcc32314
2 changed files with 24 additions and 6 deletions

View File

@ -283,10 +283,6 @@ parameters:
description: Keystone key for signing tokens. description: Keystone key for signing tokens.
type: string type: string
hidden: true hidden: true
BootstrapNodeResource:
default: controller0
description: Name of the bootstrap controller resource
type: string
resources: resources:
ControlVirtualIP: ControlVirtualIP:
type: OS::Neutron::Port type: OS::Neutron::Port
@ -364,7 +360,18 @@ resources:
public_interface_ip: public_interface_ip:
get_param: NeutronPublicInterfaceIP get_param: NeutronPublicInterfaceIP
bootstrap_host: 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} nodeid: {get_input: bootstack_nodeid}
cinder: cinder:
db: mysql://cinder:unset@localhost/cinder db: mysql://cinder:unset@localhost/cinder

View File

@ -198,7 +198,18 @@ resources:
admin-token: admin-token:
get_param: AdminToken get_param: AdminToken
bootstrap_host: 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} nodeid: {get_input: bootstack_nodeid}
bootstack: bootstack:
public_interface_ip: public_interface_ip: