Stop using notCompute in favor of controller
Updates all references for notCompute and notcompute to use 'controller' instead. Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010 Partial-bug: #1300324
This commit is contained in:
parent
101e7e9be4
commit
0223d35c0c
|
@ -25,7 +25,7 @@ Resources:
|
||||||
Ref: BlockStorageUser
|
Ref: BlockStorageUser
|
||||||
BlockStorage0CompletionCondition:
|
BlockStorage0CompletionCondition:
|
||||||
Type: AWS::CloudFormation::WaitCondition
|
Type: AWS::CloudFormation::WaitCondition
|
||||||
DependsOn: notCompute0Config
|
DependsOn: controller0Config
|
||||||
Properties:
|
Properties:
|
||||||
Handle: {Ref: BlockStorage0CompletionHandle}
|
Handle: {Ref: BlockStorage0CompletionHandle}
|
||||||
Count: '1'
|
Count: '1'
|
||||||
|
@ -51,18 +51,18 @@ Resources:
|
||||||
stack_name: {Ref: 'AWS::StackName'}
|
stack_name: {Ref: 'AWS::StackName'}
|
||||||
OpenStack::ImageBuilder::Elements: [ cinder ]
|
OpenStack::ImageBuilder::Elements: [ cinder ]
|
||||||
keystone:
|
keystone:
|
||||||
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
cinder:
|
cinder:
|
||||||
db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } , '/cinder']]}
|
db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , '/cinder']]}
|
||||||
volume_size_mb: '5000'
|
volume_size_mb: '5000'
|
||||||
service-password:
|
service-password:
|
||||||
Ref: CinderPassword
|
Ref: CinderPassword
|
||||||
include_nfs_backend: 'true'
|
include_nfs_backend: 'true'
|
||||||
nfs_shares:
|
nfs_shares:
|
||||||
- {"Fn::Join": ['', [{"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } , ':/mnt/state/var/lib/nfs_share']]}
|
- {"Fn::Join": ['', [{"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , ':/mnt/state/var/lib/nfs_share']]}
|
||||||
admin-password: {Ref: AdminPassword}
|
admin-password: {Ref: AdminPassword}
|
||||||
rabbit:
|
rabbit:
|
||||||
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
username: {Ref: RabbitUserName}
|
username: {Ref: RabbitUserName}
|
||||||
password: {Ref: RabbitPassword}
|
password: {Ref: RabbitPassword}
|
||||||
interfaces:
|
interfaces:
|
||||||
|
|
|
@ -32,7 +32,7 @@ Resources:
|
||||||
Ref: BlockStorageUser
|
Ref: BlockStorageUser
|
||||||
BlockStorage0CompletionCondition:
|
BlockStorage0CompletionCondition:
|
||||||
Type: AWS::CloudFormation::WaitCondition
|
Type: AWS::CloudFormation::WaitCondition
|
||||||
DependsOn: notCompute0Config
|
DependsOn: controller0Config
|
||||||
Properties:
|
Properties:
|
||||||
Handle: {Ref: BlockStorage0CompletionHandle}
|
Handle: {Ref: BlockStorage0CompletionHandle}
|
||||||
Count: '1'
|
Count: '1'
|
||||||
|
@ -74,9 +74,9 @@ Resources:
|
||||||
path: BlockStorage0Config.Metadata
|
path: BlockStorage0Config.Metadata
|
||||||
admin-password: {Ref: AdminPassword}
|
admin-password: {Ref: AdminPassword}
|
||||||
keystone:
|
keystone:
|
||||||
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
cinder:
|
cinder:
|
||||||
db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } , '/cinder']]}
|
db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , '/cinder']]}
|
||||||
volume_size_mb: '5000'
|
volume_size_mb: '5000'
|
||||||
service-password:
|
service-password:
|
||||||
Ref: CinderPassword
|
Ref: CinderPassword
|
||||||
|
@ -84,7 +84,7 @@ Resources:
|
||||||
Ref: CinderISCSIHelper
|
Ref: CinderISCSIHelper
|
||||||
admin-password: {Ref: AdminPassword}
|
admin-password: {Ref: AdminPassword}
|
||||||
rabbit:
|
rabbit:
|
||||||
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
username: {Ref: RabbitUserName}
|
username: {Ref: RabbitUserName}
|
||||||
password: {Ref: RabbitPassword}
|
password: {Ref: RabbitPassword}
|
||||||
interfaces:
|
interfaces:
|
||||||
|
|
|
@ -82,7 +82,7 @@ Parameters:
|
||||||
Description: admin_password for setting up auth in nova.
|
Description: admin_password for setting up auth in nova.
|
||||||
Type: String
|
Type: String
|
||||||
NoEcho: true
|
NoEcho: true
|
||||||
notcomputeImage:
|
controllerImage:
|
||||||
Type: String
|
Type: String
|
||||||
HeatStackDomainAdminPassword:
|
HeatStackDomainAdminPassword:
|
||||||
Description: Password for heat_domain_admin user.
|
Description: Password for heat_domain_admin user.
|
||||||
|
@ -93,9 +93,9 @@ Resources:
|
||||||
AccessPolicy:
|
AccessPolicy:
|
||||||
Properties:
|
Properties:
|
||||||
AllowedResources:
|
AllowedResources:
|
||||||
- notCompute0
|
- controller0
|
||||||
Type: OS::Heat::AccessPolicy
|
Type: OS::Heat::AccessPolicy
|
||||||
notCompute0Key:
|
controller0Key:
|
||||||
Properties:
|
Properties:
|
||||||
UserName:
|
UserName:
|
||||||
Ref: User
|
Ref: User
|
||||||
|
@ -105,7 +105,7 @@ Resources:
|
||||||
Policies:
|
Policies:
|
||||||
- Ref: AccessPolicy
|
- Ref: AccessPolicy
|
||||||
Type: AWS::IAM::User
|
Type: AWS::IAM::User
|
||||||
notCompute0:
|
controller0:
|
||||||
Metadata:
|
Metadata:
|
||||||
OpenStack::ImageBuilder::Elements:
|
OpenStack::ImageBuilder::Elements:
|
||||||
- nova-api
|
- nova-api
|
||||||
|
@ -155,12 +155,12 @@ Resources:
|
||||||
- {Ref: HeatDBPassword}
|
- {Ref: HeatDBPassword}
|
||||||
- '@127.0.0.1/heat'
|
- '@127.0.0.1/heat'
|
||||||
access_key_id:
|
access_key_id:
|
||||||
Ref: notCompute0Key
|
Ref: controller0Key
|
||||||
refresh:
|
refresh:
|
||||||
- resource: notCompute0
|
- resource: controller0
|
||||||
secret_key:
|
secret_key:
|
||||||
Fn::GetAtt:
|
Fn::GetAtt:
|
||||||
- notCompute0Key
|
- controller0Key
|
||||||
- SecretAccessKey
|
- SecretAccessKey
|
||||||
stack:
|
stack:
|
||||||
name:
|
name:
|
||||||
|
@ -217,7 +217,7 @@ Resources:
|
||||||
Ref: ServicePassword
|
Ref: ServicePassword
|
||||||
Properties:
|
Properties:
|
||||||
ImageId:
|
ImageId:
|
||||||
Ref: notcomputeImage
|
Ref: controllerImage
|
||||||
InstanceType:
|
InstanceType:
|
||||||
Ref: InstanceType
|
Ref: InstanceType
|
||||||
KeyName:
|
KeyName:
|
|
@ -1,6 +1,6 @@
|
||||||
Description: 'NFS server share configuration for testing'
|
Description: 'NFS server share configuration for testing'
|
||||||
Resources:
|
Resources:
|
||||||
notCompute0Config:
|
controller0Config:
|
||||||
Type: AWS::AutoScaling::LaunchConfiguration
|
Type: AWS::AutoScaling::LaunchConfiguration
|
||||||
Metadata:
|
Metadata:
|
||||||
nfs_server:
|
nfs_server:
|
||||||
|
@ -25,4 +25,4 @@ Resources:
|
||||||
- ctlplane
|
- ctlplane
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- BlockStorage0
|
- BlockStorage0
|
||||||
- networks
|
- networks
|
||||||
|
|
|
@ -129,7 +129,7 @@ Resources:
|
||||||
Ref: ComputeUser
|
Ref: ComputeUser
|
||||||
NovaCompute0CompletionCondition:
|
NovaCompute0CompletionCondition:
|
||||||
Type: AWS::CloudFormation::WaitCondition
|
Type: AWS::CloudFormation::WaitCondition
|
||||||
DependsOn: notCompute0Config
|
DependsOn: controller0Config
|
||||||
Properties:
|
Properties:
|
||||||
Handle: {Ref: NovaCompute0CompletionHandle}
|
Handle: {Ref: NovaCompute0CompletionHandle}
|
||||||
Count: '1'
|
Count: '1'
|
||||||
|
|
|
@ -125,7 +125,7 @@ Parameters:
|
||||||
Default: ''
|
Default: ''
|
||||||
Description: If set, the public interface is a vlan with this device as the raw device.
|
Description: If set, the public interface is a vlan with this device as the raw device.
|
||||||
Type: String
|
Type: String
|
||||||
notcomputeImage:
|
controllerImage:
|
||||||
Type: String
|
Type: String
|
||||||
Default: overcloud-control
|
Default: overcloud-control
|
||||||
NtpServer:
|
NtpServer:
|
||||||
|
@ -184,8 +184,8 @@ Resources:
|
||||||
AccessPolicy:
|
AccessPolicy:
|
||||||
Properties:
|
Properties:
|
||||||
AllowedResources:
|
AllowedResources:
|
||||||
- notCompute0
|
- controller0
|
||||||
- notCompute0Config
|
- controller0Config
|
||||||
Type: OS::Heat::AccessPolicy
|
Type: OS::Heat::AccessPolicy
|
||||||
ComputeAccessPolicy:
|
ComputeAccessPolicy:
|
||||||
Properties:
|
Properties:
|
||||||
|
@ -193,19 +193,19 @@ Resources:
|
||||||
- NovaCompute0
|
- NovaCompute0
|
||||||
- NovaCompute0Config
|
- NovaCompute0Config
|
||||||
Type: OS::Heat::AccessPolicy
|
Type: OS::Heat::AccessPolicy
|
||||||
notCompute0Key:
|
controller0Key:
|
||||||
Properties:
|
Properties:
|
||||||
UserName:
|
UserName:
|
||||||
Ref: User
|
Ref: User
|
||||||
Type: AWS::IAM::AccessKey
|
Type: AWS::IAM::AccessKey
|
||||||
notCompute0CompletionCondition:
|
controller0CompletionCondition:
|
||||||
Type: AWS::CloudFormation::WaitCondition
|
Type: AWS::CloudFormation::WaitCondition
|
||||||
DependsOn: notCompute0Config
|
DependsOn: controller0Config
|
||||||
Properties:
|
Properties:
|
||||||
Handle: {Ref: notCompute0CompletionHandle}
|
Handle: {Ref: controller0CompletionHandle}
|
||||||
Count: '1'
|
Count: '1'
|
||||||
Timeout: '1800'
|
Timeout: '1800'
|
||||||
notCompute0CompletionHandle:
|
controller0CompletionHandle:
|
||||||
Type: OS::Heat::UpdateWaitConditionHandle
|
Type: OS::Heat::UpdateWaitConditionHandle
|
||||||
NovaCompute0Key:
|
NovaCompute0Key:
|
||||||
Type: FileInclude
|
Type: FileInclude
|
||||||
|
@ -229,14 +229,14 @@ Resources:
|
||||||
Path: nova-compute-instance.yaml
|
Path: nova-compute-instance.yaml
|
||||||
SubKey: Resources.NovaCompute0Config
|
SubKey: Resources.NovaCompute0Config
|
||||||
Parameters:
|
Parameters:
|
||||||
NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
|
GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
|
||||||
NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/nova']]}
|
NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/nova']]}
|
||||||
CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/ceilometer']]}
|
CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/ceilometer']]}
|
||||||
NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/neutron']]}
|
NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/neutron']]}
|
||||||
NeutronNetworkType: "gre"
|
NeutronNetworkType: "gre"
|
||||||
NeutronEnableTunnelling: "True"
|
NeutronEnableTunnelling: "True"
|
||||||
NeutronFlatNetworks:
|
NeutronFlatNetworks:
|
||||||
|
@ -284,7 +284,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- ctlplane
|
- ctlplane
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
- {Ref: CloudName}
|
- {Ref: CloudName}
|
||||||
# If CloudName is unset, make the hosts line still valid
|
# If CloudName is unset, make the hosts line still valid
|
||||||
|
@ -298,7 +298,7 @@ Resources:
|
||||||
Policies:
|
Policies:
|
||||||
- Ref: AccessPolicy
|
- Ref: AccessPolicy
|
||||||
Type: AWS::IAM::User
|
Type: AWS::IAM::User
|
||||||
notCompute0Config:
|
controller0Config:
|
||||||
Type: AWS::AutoScaling::LaunchConfiguration
|
Type: AWS::AutoScaling::LaunchConfiguration
|
||||||
Properties:
|
Properties:
|
||||||
ImageId: '0'
|
ImageId: '0'
|
||||||
|
@ -325,14 +325,14 @@ Resources:
|
||||||
iscsi-helper:
|
iscsi-helper:
|
||||||
Ref: CinderISCSIHelper
|
Ref: CinderISCSIHelper
|
||||||
completion-handle:
|
completion-handle:
|
||||||
Ref: notCompute0CompletionHandle
|
Ref: controller0CompletionHandle
|
||||||
controller-address:
|
controller-address:
|
||||||
Fn::Select:
|
Fn::Select:
|
||||||
- 0
|
- 0
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
db-password: unset
|
db-password: unset
|
||||||
glance:
|
glance:
|
||||||
|
@ -344,7 +344,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
service-password:
|
service-password:
|
||||||
Ref: GlancePassword
|
Ref: GlancePassword
|
||||||
|
@ -372,7 +372,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
- ':8003'
|
- ':8003'
|
||||||
metadata_server_url:
|
metadata_server_url:
|
||||||
|
@ -384,7 +384,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
- ':8000'
|
- ':8000'
|
||||||
waitcondition_server_url:
|
waitcondition_server_url:
|
||||||
|
@ -396,7 +396,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
- ':8000/v1/waitcondition'
|
- ':8000/v1/waitcondition'
|
||||||
hosts:
|
hosts:
|
||||||
|
@ -407,7 +407,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- ctlplane
|
- ctlplane
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
- {Ref: CloudName}
|
- {Ref: CloudName}
|
||||||
keystone:
|
keystone:
|
||||||
|
@ -418,7 +418,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
mysql:
|
mysql:
|
||||||
innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize}
|
innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize}
|
||||||
|
@ -430,7 +430,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- ctlplane
|
- ctlplane
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
metadata_proxy_shared_secret: unset
|
metadata_proxy_shared_secret: unset
|
||||||
ovs:
|
ovs:
|
||||||
|
@ -441,7 +441,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- ctlplane
|
- ctlplane
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
bridge_mappings: {Ref: NeutronBridgeMappings}
|
bridge_mappings: {Ref: NeutronBridgeMappings}
|
||||||
public_interface:
|
public_interface:
|
||||||
|
@ -471,7 +471,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
metadata-proxy: true
|
metadata-proxy: true
|
||||||
service-password:
|
service-password:
|
||||||
|
@ -479,11 +479,11 @@ Resources:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
cfn:
|
cfn:
|
||||||
access_key_id:
|
access_key_id:
|
||||||
Ref: notCompute0Key
|
Ref: controller0Key
|
||||||
path: notCompute0Config.Metadata
|
path: controller0Config.Metadata
|
||||||
secret_access_key:
|
secret_access_key:
|
||||||
Fn::GetAtt:
|
Fn::GetAtt:
|
||||||
- notCompute0Key
|
- controller0Key
|
||||||
- SecretAccessKey
|
- SecretAccessKey
|
||||||
stack_name:
|
stack_name:
|
||||||
Ref: AWS::StackName
|
Ref: AWS::StackName
|
||||||
|
@ -494,7 +494,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- ctlplane
|
- ctlplane
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
username:
|
username:
|
||||||
Ref: RabbitUserName
|
Ref: RabbitUserName
|
||||||
|
@ -507,11 +507,11 @@ Resources:
|
||||||
ntp:
|
ntp:
|
||||||
servers:
|
servers:
|
||||||
- {server: {Ref: NtpServer}, fudge: "stratum 0"}
|
- {server: {Ref: NtpServer}, fudge: "stratum 0"}
|
||||||
notCompute0:
|
controller0:
|
||||||
Type: OS::Nova::Server
|
Type: OS::Nova::Server
|
||||||
Properties:
|
Properties:
|
||||||
image:
|
image:
|
||||||
Ref: notcomputeImage
|
Ref: controllerImage
|
||||||
image_update_policy:
|
image_update_policy:
|
||||||
Ref: ImageUpdatePolicy
|
Ref: ImageUpdatePolicy
|
||||||
flavor:
|
flavor:
|
||||||
|
@ -522,11 +522,11 @@ Resources:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
cfn:
|
cfn:
|
||||||
access_key_id:
|
access_key_id:
|
||||||
Ref: notCompute0Key
|
Ref: controller0Key
|
||||||
path: notCompute0Config.Metadata
|
path: controller0Config.Metadata
|
||||||
secret_access_key:
|
secret_access_key:
|
||||||
Fn::GetAtt:
|
Fn::GetAtt:
|
||||||
- notCompute0Key
|
- controller0Key
|
||||||
- SecretAccessKey
|
- SecretAccessKey
|
||||||
stack_name:
|
stack_name:
|
||||||
Ref: AWS::StackName
|
Ref: AWS::StackName
|
||||||
|
@ -542,6 +542,6 @@ Outputs:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- ctlplane
|
- ctlplane
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
- :5000/v2.0/
|
- :5000/v2.0/
|
||||||
|
|
|
@ -11,7 +11,7 @@ Parameters:
|
||||||
Type: String
|
Type: String
|
||||||
NoEcho: true
|
NoEcho: true
|
||||||
Resources:
|
Resources:
|
||||||
notCompute0Config:
|
controller0Config:
|
||||||
Type: AWS::AutoScaling::LaunchConfiguration
|
Type: AWS::AutoScaling::LaunchConfiguration
|
||||||
Metadata:
|
Metadata:
|
||||||
stunnel:
|
stunnel:
|
||||||
|
|
|
@ -11,7 +11,7 @@ Parameters:
|
||||||
Type: String
|
Type: String
|
||||||
NoEcho: true
|
NoEcho: true
|
||||||
Resources:
|
Resources:
|
||||||
notCompute0Config:
|
controller0Config:
|
||||||
Type: AWS::AutoScaling::LaunchConfiguration
|
Type: AWS::AutoScaling::LaunchConfiguration
|
||||||
Metadata:
|
Metadata:
|
||||||
swift:
|
swift:
|
||||||
|
@ -26,7 +26,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
- ':%PORT%/d1'
|
- ':%PORT%/d1'
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
|
|
|
@ -32,7 +32,7 @@ Resources:
|
||||||
Ref: SwiftStorageUser
|
Ref: SwiftStorageUser
|
||||||
SwiftStorage0CompletionCondition:
|
SwiftStorage0CompletionCondition:
|
||||||
Type: AWS::CloudFormation::WaitCondition
|
Type: AWS::CloudFormation::WaitCondition
|
||||||
DependsOn: notCompute0Config
|
DependsOn: controller0Config
|
||||||
Properties:
|
Properties:
|
||||||
Handle: {Ref: SwiftStorage0CompletionHandle}
|
Handle: {Ref: SwiftStorage0CompletionHandle}
|
||||||
Count: '1'
|
Count: '1'
|
||||||
|
@ -99,7 +99,7 @@ Resources:
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 'ctlplane'
|
||||||
- Fn::GetAtt:
|
- Fn::GetAtt:
|
||||||
- notCompute0
|
- controller0
|
||||||
- networks
|
- networks
|
||||||
- ':%PORT%/d1'
|
- ':%PORT%/d1'
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
|
|
|
@ -93,19 +93,19 @@ Resources:
|
||||||
AllowedResources:
|
AllowedResources:
|
||||||
- undercloudConfig
|
- undercloudConfig
|
||||||
Type: OS::Heat::AccessPolicy
|
Type: OS::Heat::AccessPolicy
|
||||||
notCompute0Key:
|
controller0Key:
|
||||||
Properties:
|
Properties:
|
||||||
UserName:
|
UserName:
|
||||||
Ref: User
|
Ref: User
|
||||||
Type: AWS::IAM::AccessKey
|
Type: AWS::IAM::AccessKey
|
||||||
notCompute0CompletionCondition:
|
controller0CompletionCondition:
|
||||||
Type: AWS::CloudFormation::WaitCondition
|
Type: AWS::CloudFormation::WaitCondition
|
||||||
DependsOn: undercloud
|
DependsOn: undercloud
|
||||||
Properties:
|
Properties:
|
||||||
Handle: {Ref: notCompute0CompletionHandle}
|
Handle: {Ref: controller0CompletionHandle}
|
||||||
Count: '1'
|
Count: '1'
|
||||||
Timeout: '1800'
|
Timeout: '1800'
|
||||||
notCompute0CompletionHandle:
|
controller0CompletionHandle:
|
||||||
Type: AWS::CloudFormation::WaitConditionHandle
|
Type: AWS::CloudFormation::WaitConditionHandle
|
||||||
User:
|
User:
|
||||||
Properties:
|
Properties:
|
||||||
|
@ -137,7 +137,7 @@ Resources:
|
||||||
db: mysql://cinder:unset@localhost/cinder
|
db: mysql://cinder:unset@localhost/cinder
|
||||||
volume_size_mb: '5000'
|
volume_size_mb: '5000'
|
||||||
completion-handle:
|
completion-handle:
|
||||||
Ref: notCompute0CompletionHandle
|
Ref: controller0CompletionHandle
|
||||||
db-password: unset
|
db-password: unset
|
||||||
glance:
|
glance:
|
||||||
backend: file
|
backend: file
|
||||||
|
@ -196,11 +196,11 @@ Resources:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
cfn:
|
cfn:
|
||||||
access_key_id:
|
access_key_id:
|
||||||
Ref: notCompute0Key
|
Ref: controller0Key
|
||||||
path: undercloudConfig.Metadata
|
path: undercloudConfig.Metadata
|
||||||
secret_access_key:
|
secret_access_key:
|
||||||
Fn::GetAtt:
|
Fn::GetAtt:
|
||||||
- notCompute0Key
|
- controller0Key
|
||||||
- SecretAccessKey
|
- SecretAccessKey
|
||||||
stack_name:
|
stack_name:
|
||||||
Ref: AWS::StackName
|
Ref: AWS::StackName
|
||||||
|
@ -248,11 +248,11 @@ Resources:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
cfn:
|
cfn:
|
||||||
access_key_id:
|
access_key_id:
|
||||||
Ref: notCompute0Key
|
Ref: controller0Key
|
||||||
path: undercloudConfig.Metadata
|
path: undercloudConfig.Metadata
|
||||||
secret_access_key:
|
secret_access_key:
|
||||||
Fn::GetAtt:
|
Fn::GetAtt:
|
||||||
- notCompute0Key
|
- controller0Key
|
||||||
- SecretAccessKey
|
- SecretAccessKey
|
||||||
stack_name:
|
stack_name:
|
||||||
Ref: AWS::StackName
|
Ref: AWS::StackName
|
||||||
|
|
Loading…
Reference in New Issue