BlockStore: Exec puppet after all configuration

[apex-tripleo-heat-templates.git] / cinder-storage.yaml

diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index d714501..0f12223 100644 (file)
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -1,9 +1,6 @@
 heat_template_version: 2014-10-16
 description: 'Common Block Storage Configuration'
 parameters:
-  AdminPassword:
-    default: ''
-    type: string
   Image:
     default: overcloud-cinder-volume
     type: string
@@ -15,11 +12,6 @@ parameters:
     default: 5000
     description: The size of the loopback file used by the cinder LVM driver.
     type: number
-  CinderPassword:
-    default: unset
-    description: The password for the cinder service account, used by cinder-api.
-    hidden: true
-    type: string
   VirtualIP:
     default: ''
     type: string
@@ -62,9 +54,10 @@ parameters:
         }
     type: json
   Flavor:
-    default: baremetal
     description: Flavor for block storage nodes to request when deploying.
     type: string
+    constraints:
+      - custom_constraint: nova.flavor
   GlancePort:
     default: "9292"
     description: Glance port.
@@ -115,15 +108,12 @@ resources:
     properties:
       group: os-apply-config
       config:
-        admin-password: {get_param: AdminPassword}
         keystone:
           host: {get_input: controller_virtual_ip}
         cinder:
           db: {get_input: cinder_dsn}
           volume_size_mb:
             get_param: CinderLVMLoopDeviceSize
-          service-password:
-            get_param: CinderPassword
           iscsi-helper:
             get_param: CinderISCSIHelper
         snmpd: