summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block-storage-nfs.yaml1
-rw-r--r--controller.yaml8
2 files changed, 0 insertions, 9 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml
index c1653837..93ac4f65 100644
--- a/block-storage-nfs.yaml
+++ b/block-storage-nfs.yaml
@@ -49,7 +49,6 @@ Resources:
secret_access_key:
Fn::GetAtt: [ BlockStorageKey, SecretAccessKey ]
stack_name: {Ref: 'AWS::StackName'}
- OpenStack::ImageBuilder::Elements: [ cinder ]
keystone:
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
cinder:
diff --git a/controller.yaml b/controller.yaml
index 758778d8..f7a8633e 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -107,14 +107,6 @@ Resources:
Type: AWS::IAM::User
controller0:
Metadata:
- OpenStack::ImageBuilder::Elements:
- - nova-api
- - keystone
- - heat-api
- - heat-engine
- - glance
- - mysql-migration
- - rabbitmq-server
admin-password:
Ref: ServicePassword
admin-token: