diff options
| -rw-r--r-- | ironic-source.yaml | 2 | ||||
| -rw-r--r-- | tuskar-source.yaml | 2 | ||||
| -rw-r--r-- | undercloud-bm-source.yaml | 2 | ||||
| -rw-r--r-- | undercloud-source.yaml | 20 | ||||
| -rw-r--r-- | undercloud-vm-source.yaml | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/ironic-source.yaml b/ironic-source.yaml index ec26c7ae..6782225e 100644 --- a/ironic-source.yaml +++ b/ironic-source.yaml @@ -8,7 +8,7 @@ Resources: ironic: Type: AWS::AutoScaling::LaunchConfiguration Metadata: - OpenStack::Role: notcomputeConfig + OpenStack::Role: undercloudConfig ironic: db: mysql://ironic:unset@localhost/ironic service-password: {Ref: IronicPassword} diff --git a/tuskar-source.yaml b/tuskar-source.yaml index 0d4cc5f6..6f84292d 100644 --- a/tuskar-source.yaml +++ b/tuskar-source.yaml @@ -11,7 +11,7 @@ Resources: undercloudTuskarVm: Type: AWS::AutoScaling::LaunchConfiguration Metadata: - OpenStack::Role: notcomputeConfig + OpenStack::Role: undercloudConfig tuskar: db: mysql://tuskar:unset@localhost/tuskar?charset=utf8 user: admin diff --git a/undercloud-bm-source.yaml b/undercloud-bm-source.yaml index be0647cb..23844484 100644 --- a/undercloud-bm-source.yaml +++ b/undercloud-bm-source.yaml @@ -8,7 +8,7 @@ Parameters: Description: Bare metal power manager driver. Type: String Resources: - notcomputeConfig: + undercloudConfig: Type: AWS::AutoScaling::LaunchConfiguration Metadata: nova: diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 9dcbf538..f017f62a 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -50,7 +50,7 @@ Resources: AccessPolicy: Properties: AllowedResources: - - notcomputeConfig + - undercloudConfig Type: OS::Heat::AccessPolicy Key: Properties: @@ -62,13 +62,13 @@ Resources: Policies: - Ref: AccessPolicy Type: AWS::IAM::User - notcomputeConfig: + undercloudConfig: Type: AWS::AutoScaling::LaunchConfiguration Properties: ImageId: '0' InstanceType: foo Metadata: - OpenStack::Role: notcomputeConfig + OpenStack::Role: undercloudConfig OpenStack::Heat::Stack: {} Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ] admin-password: @@ -81,7 +81,7 @@ Resources: - Fn::Select: - "ctlplane" - Fn::GetAtt: - - notcompute + - undercloud - networks cinder: db: mysql://cinder:unset@localhost/cinder @@ -104,25 +104,25 @@ Resources: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} - ":8003" metadata_server_url: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} - ":8000" waitcondition_server_url: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} - ":8000/v1/waitcondition" os-collect-config: cfn: access_key_id: Ref: Key - path: notcomputeConfig.Metadata + path: undercloudConfig.Metadata secret_access_key: Fn::GetAtt: - Key @@ -150,7 +150,7 @@ Resources: rabbit: host: 127.0.0.1 password: guest - notcompute: + undercloud: Type: OS::Nova::Server Properties: image: @@ -164,7 +164,7 @@ Resources: cfn: access_key_id: Ref: Key - path: notcomputeConfig.Metadata + path: undercloudConfig.Metadata secret_access_key: Fn::GetAtt: - Key diff --git a/undercloud-vm-source.yaml b/undercloud-vm-source.yaml index 4d0d64f0..9cc1ea25 100644 --- a/undercloud-vm-source.yaml +++ b/undercloud-vm-source.yaml @@ -12,7 +12,7 @@ Parameters: Description: What username to ssh to the virtual power host with. Type: String Resources: - notcomputeConfig: + undercloudConfig: Type: AWS::AutoScaling::LaunchConfiguration Metadata: nova: |