diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 3 | ||||
| -rw-r--r-- | overcloud-source.yaml | 4 | ||||
| -rw-r--r-- | swift-source.yaml | 35 | ||||
| -rw-r--r-- | undercloud-bm.yaml | 1 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 1 |
6 files changed, 45 insertions, 5 deletions
@@ -1,5 +1,7 @@ -overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml - python merge.py $< > $@.tmp +overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml + # $^ won't work here because we want to list nova-compute-instance.yaml as + # a prerequisite but don't want to pass it into merge.py + python merge.py overcloud-source.yaml swift-source.yaml > $@.tmp mv $@.tmp $@ undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index dd7c39ae..91520659 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -131,6 +131,3 @@ Resources: rabbit: host: {Ref: RabbitHost} password: {Ref: RabbitPassword} - swift: - store_user: '' - store_key: '' diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 8285c8f8..798ca8dc 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -176,6 +176,7 @@ Resources: - networks db-password: unset glance: + backend: swift db: mysql://glance:unset@localhost/glance host: Fn::Select: @@ -187,6 +188,9 @@ Resources: - networks service-password: Ref: GlancePassword + swift-store-user: service:glance + swift-store-key: + Ref: GlancePassword heat: admin_password: Ref: HeatPassword diff --git a/swift-source.yaml b/swift-source.yaml new file mode 100644 index 00000000..a982d2f4 --- /dev/null +++ b/swift-source.yaml @@ -0,0 +1,35 @@ +Description: 'Swift-common: Openstack object storage common configurations' +Parameters: + SwiftHashSuffix: + Default: unset + Description: A random string to be used as a salt when hashing to determine mappings in the ring. + Type: String + NoEcho: true + SwiftPassword: + Default: unset + Description: The password for the swift service account, used by the swift proxy services. + Type: String + NoEcho: true +Resources: + notcomputeConfig: + Type: AWS::AutoScaling::LaunchConfiguration + Metadata: + swift: + devices: + Fn::Join: + - '' + - - 'r1z1-' + - Fn::Select: + - 0 + - Fn::Select: + - 'ctlplane' + - Fn::GetAtt: + - notcompute + - networks + - ':%PORT%/d1' + hash: + Ref: SwiftHashSuffix + part-power: 10 + replicas: 1 + service-password: + Ref: SwiftPassword diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml index 7ec33d9b..40f7b4a3 100644 --- a/undercloud-bm.yaml +++ b/undercloud-bm.yaml @@ -95,6 +95,7 @@ Resources: volume_size_mb: '5000' db-password: unset glance: + backend: file db: mysql://glance:unset@localhost/glance host: 127.0.0.1 service-password: diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index 41fb666a..a8c82f37 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -100,6 +100,7 @@ Resources: volume_size_mb: '5000' db-password: unset glance: + backend: file db: mysql://glance:unset@localhost/glance host: 127.0.0.1 service-password: |