From 0fce77e3c2169a05d84ee6e7b76fe651429aa380 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Tue, 20 Jan 2015 08:49:53 -0500
Subject: Remove unused cinder params from -without-mergepy

Cinder block storage nodes shouldn't need to know the
AdminPassword and CinderPassword values. There are
no services which require Keystone related passwords
on the block storage nodes.

Change-Id: I4aa89347c60ec6258bd66725a895f6fd2b4844f6
---
 cinder-storage.yaml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'cinder-storage.yaml')

diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index b30dcdb6..0f122238 100644
--- 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
@@ -116,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:
-- 
cgit 1.2.3-korg