aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-04-11 18:50:53 +0000
committerGerrit Code Review <review@openstack.org>2014-04-11 18:50:53 +0000
commita830cea3b1071f70485f427877ac4577f5d13e16 (patch)
treea9d40bdc01fe6eab9e532809bc29c0d7ff1c5cd7
parent64a616c4267e663f2a51fcb29117734b2a7af87b (diff)
parent0223d35c0cfe810a47a22df0a6aa5c858ccba335 (diff)
Merge "Stop using notCompute in favor of controller"
-rw-r--r--block-storage-nfs.yaml10
-rw-r--r--block-storage.yaml8
-rw-r--r--controller.yaml (renamed from notcompute.yaml)16
-rw-r--r--nfs-server-source.yaml4
-rw-r--r--nova-compute-instance.yaml2
-rw-r--r--overcloud-source.yaml78
-rw-r--r--ssl-source.yaml2
-rw-r--r--swift-source.yaml4
-rw-r--r--swift-storage-source.yaml4
-rw-r--r--undercloud-source.yaml18
10 files changed, 73 insertions, 73 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml
index d00484b9..c1653837 100644
--- a/block-storage-nfs.yaml
+++ b/block-storage-nfs.yaml
@@ -25,7 +25,7 @@ Resources:
Ref: BlockStorageUser
BlockStorage0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
- DependsOn: notCompute0Config
+ DependsOn: controller0Config
Properties:
Handle: {Ref: BlockStorage0CompletionHandle}
Count: '1'
@@ -51,18 +51,18 @@ Resources:
stack_name: {Ref: 'AWS::StackName'}
OpenStack::ImageBuilder::Elements: [ cinder ]
keystone:
- host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
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'
service-password:
Ref: CinderPassword
include_nfs_backend: 'true'
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}
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}
password: {Ref: RabbitPassword}
interfaces:
diff --git a/block-storage.yaml b/block-storage.yaml
index 312ce95b..c437aa69 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -32,7 +32,7 @@ Resources:
Ref: BlockStorageUser
BlockStorage0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
- DependsOn: notCompute0Config
+ DependsOn: controller0Config
Properties:
Handle: {Ref: BlockStorage0CompletionHandle}
Count: '1'
@@ -74,9 +74,9 @@ Resources:
path: BlockStorage0Config.Metadata
admin-password: {Ref: AdminPassword}
keystone:
- host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
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'
service-password:
Ref: CinderPassword
@@ -84,7 +84,7 @@ Resources:
Ref: CinderISCSIHelper
admin-password: {Ref: AdminPassword}
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}
password: {Ref: RabbitPassword}
interfaces:
diff --git a/notcompute.yaml b/controller.yaml
index 5a4d9d21..758778d8 100644
--- a/notcompute.yaml
+++ b/controller.yaml
@@ -82,7 +82,7 @@ Parameters:
Description: admin_password for setting up auth in nova.
Type: String
NoEcho: true
- notcomputeImage:
+ controllerImage:
Type: String
HeatStackDomainAdminPassword:
Description: Password for heat_domain_admin user.
@@ -93,9 +93,9 @@ Resources:
AccessPolicy:
Properties:
AllowedResources:
- - notCompute0
+ - controller0
Type: OS::Heat::AccessPolicy
- notCompute0Key:
+ controller0Key:
Properties:
UserName:
Ref: User
@@ -105,7 +105,7 @@ Resources:
Policies:
- Ref: AccessPolicy
Type: AWS::IAM::User
- notCompute0:
+ controller0:
Metadata:
OpenStack::ImageBuilder::Elements:
- nova-api
@@ -155,12 +155,12 @@ Resources:
- {Ref: HeatDBPassword}
- '@127.0.0.1/heat'
access_key_id:
- Ref: notCompute0Key
+ Ref: controller0Key
refresh:
- - resource: notCompute0
+ - resource: controller0
secret_key:
Fn::GetAtt:
- - notCompute0Key
+ - controller0Key
- SecretAccessKey
stack:
name:
@@ -217,7 +217,7 @@ Resources:
Ref: ServicePassword
Properties:
ImageId:
- Ref: notcomputeImage
+ Ref: controllerImage
InstanceType:
Ref: InstanceType
KeyName:
diff --git a/nfs-server-source.yaml b/nfs-server-source.yaml
index 22214ae0..0fed3920 100644
--- a/nfs-server-source.yaml
+++ b/nfs-server-source.yaml
@@ -1,6 +1,6 @@
Description: 'NFS server share configuration for testing'
Resources:
- notCompute0Config:
+ controller0Config:
Type: AWS::AutoScaling::LaunchConfiguration
Metadata:
nfs_server:
@@ -25,4 +25,4 @@ Resources:
- ctlplane
- Fn::GetAtt:
- BlockStorage0
- - networks \ No newline at end of file
+ - networks
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 92e9a019..a1c541be 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -129,7 +129,7 @@ Resources:
Ref: ComputeUser
NovaCompute0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
- DependsOn: notCompute0Config
+ DependsOn: controller0Config
Properties:
Handle: {Ref: NovaCompute0CompletionHandle}
Count: '1'
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 6b7be9ad..950b39a5 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -125,7 +125,7 @@ Parameters:
Default: ''
Description: If set, the public interface is a vlan with this device as the raw device.
Type: String
- notcomputeImage:
+ controllerImage:
Type: String
Default: overcloud-control
NtpServer:
@@ -184,8 +184,8 @@ Resources:
AccessPolicy:
Properties:
AllowedResources:
- - notCompute0
- - notCompute0Config
+ - controller0
+ - controller0Config
Type: OS::Heat::AccessPolicy
ComputeAccessPolicy:
Properties:
@@ -193,19 +193,19 @@ Resources:
- NovaCompute0
- NovaCompute0Config
Type: OS::Heat::AccessPolicy
- notCompute0Key:
+ controller0Key:
Properties:
UserName:
Ref: User
Type: AWS::IAM::AccessKey
- notCompute0CompletionCondition:
+ controller0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
- DependsOn: notCompute0Config
+ DependsOn: controller0Config
Properties:
- Handle: {Ref: notCompute0CompletionHandle}
+ Handle: {Ref: controller0CompletionHandle}
Count: '1'
Timeout: '1800'
- notCompute0CompletionHandle:
+ controller0CompletionHandle:
Type: OS::Heat::UpdateWaitConditionHandle
NovaCompute0Key:
Type: FileInclude
@@ -229,14 +229,14 @@ Resources:
Path: nova-compute-instance.yaml
SubKey: Resources.NovaCompute0Config
Parameters:
- NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
- KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
- RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
- NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
- GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
- NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/nova']]}
- CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/ceilometer']]}
- NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/neutron']]}
+ NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
+ KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
+ RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
+ NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, 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": [controller0, networks]} ]} ]}, '/nova']]}
+ 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": [controller0, networks]} ]} ]}, '/neutron']]}
NeutronNetworkType: "gre"
NeutronEnableTunnelling: "True"
NeutronFlatNetworks:
@@ -284,7 +284,7 @@ Resources:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
- {Ref: CloudName}
# If CloudName is unset, make the hosts line still valid
@@ -298,7 +298,7 @@ Resources:
Policies:
- Ref: AccessPolicy
Type: AWS::IAM::User
- notCompute0Config:
+ controller0Config:
Type: AWS::AutoScaling::LaunchConfiguration
Properties:
ImageId: '0'
@@ -325,14 +325,14 @@ Resources:
iscsi-helper:
Ref: CinderISCSIHelper
completion-handle:
- Ref: notCompute0CompletionHandle
+ Ref: controller0CompletionHandle
controller-address:
Fn::Select:
- 0
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
db-password: unset
glance:
@@ -344,7 +344,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
service-password:
Ref: GlancePassword
@@ -372,7 +372,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
- ':8003'
metadata_server_url:
@@ -384,7 +384,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
- ':8000'
waitcondition_server_url:
@@ -396,7 +396,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
- ':8000/v1/waitcondition'
hosts:
@@ -407,7 +407,7 @@ Resources:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
- {Ref: CloudName}
keystone:
@@ -418,7 +418,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
mysql:
innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize}
@@ -430,7 +430,7 @@ Resources:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
metadata_proxy_shared_secret: unset
ovs:
@@ -441,7 +441,7 @@ Resources:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
bridge_mappings: {Ref: NeutronBridgeMappings}
public_interface:
@@ -471,7 +471,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
metadata-proxy: true
service-password:
@@ -479,11 +479,11 @@ Resources:
os-collect-config:
cfn:
access_key_id:
- Ref: notCompute0Key
- path: notCompute0Config.Metadata
+ Ref: controller0Key
+ path: controller0Config.Metadata
secret_access_key:
Fn::GetAtt:
- - notCompute0Key
+ - controller0Key
- SecretAccessKey
stack_name:
Ref: AWS::StackName
@@ -494,7 +494,7 @@ Resources:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
username:
Ref: RabbitUserName
@@ -507,11 +507,11 @@ Resources:
ntp:
servers:
- {server: {Ref: NtpServer}, fudge: "stratum 0"}
- notCompute0:
+ controller0:
Type: OS::Nova::Server
Properties:
image:
- Ref: notcomputeImage
+ Ref: controllerImage
image_update_policy:
Ref: ImageUpdatePolicy
flavor:
@@ -522,11 +522,11 @@ Resources:
os-collect-config:
cfn:
access_key_id:
- Ref: notCompute0Key
- path: notCompute0Config.Metadata
+ Ref: controller0Key
+ path: controller0Config.Metadata
secret_access_key:
Fn::GetAtt:
- - notCompute0Key
+ - controller0Key
- SecretAccessKey
stack_name:
Ref: AWS::StackName
@@ -542,6 +542,6 @@ Outputs:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
- :5000/v2.0/
diff --git a/ssl-source.yaml b/ssl-source.yaml
index 4fdd0f3b..14b0eb11 100644
--- a/ssl-source.yaml
+++ b/ssl-source.yaml
@@ -11,7 +11,7 @@ Parameters:
Type: String
NoEcho: true
Resources:
- notCompute0Config:
+ controller0Config:
Type: AWS::AutoScaling::LaunchConfiguration
Metadata:
stunnel:
diff --git a/swift-source.yaml b/swift-source.yaml
index 8661154d..048d1357 100644
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@ -11,7 +11,7 @@ Parameters:
Type: String
NoEcho: true
Resources:
- notCompute0Config:
+ controller0Config:
Type: AWS::AutoScaling::LaunchConfiguration
Metadata:
swift:
@@ -26,7 +26,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
- ':%PORT%/d1'
- Fn::Join:
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index 16f2f36c..93011e70 100644
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -32,7 +32,7 @@ Resources:
Ref: SwiftStorageUser
SwiftStorage0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
- DependsOn: notCompute0Config
+ DependsOn: controller0Config
Properties:
Handle: {Ref: SwiftStorage0CompletionHandle}
Count: '1'
@@ -99,7 +99,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notCompute0
+ - controller0
- networks
- ':%PORT%/d1'
- Fn::Join:
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 57508fda..c05d5f7d 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -96,19 +96,19 @@ Resources:
AllowedResources:
- undercloudConfig
Type: OS::Heat::AccessPolicy
- notCompute0Key:
+ controller0Key:
Properties:
UserName:
Ref: User
Type: AWS::IAM::AccessKey
- notCompute0CompletionCondition:
+ controller0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
DependsOn: undercloud
Properties:
- Handle: {Ref: notCompute0CompletionHandle}
+ Handle: {Ref: controller0CompletionHandle}
Count: '1'
Timeout: '1800'
- notCompute0CompletionHandle:
+ controller0CompletionHandle:
Type: AWS::CloudFormation::WaitConditionHandle
User:
Properties:
@@ -140,7 +140,7 @@ Resources:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
completion-handle:
- Ref: notCompute0CompletionHandle
+ Ref: controller0CompletionHandle
db-password: unset
glance:
backend: file
@@ -199,11 +199,11 @@ Resources:
os-collect-config:
cfn:
access_key_id:
- Ref: notCompute0Key
+ Ref: controller0Key
path: undercloudConfig.Metadata
secret_access_key:
Fn::GetAtt:
- - notCompute0Key
+ - controller0Key
- SecretAccessKey
stack_name:
Ref: AWS::StackName
@@ -254,11 +254,11 @@ Resources:
os-collect-config:
cfn:
access_key_id:
- Ref: notCompute0Key
+ Ref: controller0Key
path: undercloudConfig.Metadata
secret_access_key:
Fn::GetAtt:
- - notCompute0Key
+ - controller0Key
- SecretAccessKey
stack_name:
Ref: AWS::StackName