From fa4ed015b083dfe416aaf2cd666ca666284608ce Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 12 Oct 2015 13:59:22 +0300
Subject: Set shared secrets, keys and passwords as hidden

Change-Id: Ieb27729c6b33ffc849d07200ec0d42508214956e
Closes-Bug: #1399793
---
 puppet/cinder-storage.yaml                                  | 1 +
 puppet/compute.yaml                                         | 1 +
 puppet/controller.yaml                                      | 4 ++++
 puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml | 2 ++
 4 files changed, 8 insertions(+)

(limited to 'puppet')

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 972523ae..6a869219 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -59,6 +59,7 @@ parameters:
   RabbitPassword:
     default: 'guest'
     type: string
+    hidden: true
   RabbitUserName:
     default: 'guest'
     type: string
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index bdee93dd..810a8b9b 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -149,6 +149,7 @@ parameters:
     default: 'unset'
     description: Shared secret to prevent spoofing
     type: string
+    hidden: true
   NeutronCorePlugin:
     default: 'ml2'
     description: |
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 8ea7053e..5013cf32 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -187,6 +187,7 @@ parameters:
   HeatAuthEncryptionKey:
     description: Auth encryption key for heat-engine
     type: string
+    hidden: true
   HorizonAllowedHosts:
     default: '*'
     description: A list of IP/Hostname allowed to connect to horizon
@@ -194,6 +195,7 @@ parameters:
   HorizonSecret:
     description: Secret key for Django
     type: string
+    hidden: true
   Image:
     type: string
     default: overcloud-control
@@ -301,6 +303,7 @@ parameters:
     default: 'unset'
     description: Shared secret to prevent spoofing
     type: string
+    hidden: true
   NeutronCorePlugin:
     default: 'ml2'
     description: |
@@ -414,6 +417,7 @@ parameters:
   PcsdPassword:
     type: string
     description: The password for the 'pcsd' user.
+    hidden: true
   PublicVirtualInterface:
     default: 'br-ex'
     description: >
diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
index 18295a2f..7ec2190f 100644
--- a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
@@ -18,6 +18,7 @@ parameters:
     type: string
   CinderNetappPassword:
     type: string
+    hidden: true
   CinderNetappServerHostname:
     type: string
   CinderNetappServerPort:
@@ -65,6 +66,7 @@ parameters:
   CinderNetappSaPassword:
     type: string
     default: ''
+    hidden: true
   CinderNetappStoragePools:
     type: string
     default: ''
-- 
cgit 1.2.3-korg