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
---
 os-apply-config/ceph-storage.yaml   | 2 ++
 os-apply-config/cinder-storage.yaml | 1 +
 os-apply-config/compute.yaml        | 1 +
 os-apply-config/controller.yaml     | 4 ++++
 4 files changed, 8 insertions(+)

(limited to 'os-apply-config')

diff --git a/os-apply-config/ceph-storage.yaml b/os-apply-config/ceph-storage.yaml
index 0dbcd3e7..fc321d88 100644
--- a/os-apply-config/ceph-storage.yaml
+++ b/os-apply-config/ceph-storage.yaml
@@ -20,10 +20,12 @@ parameters:
     default: ''
     description: The Ceph monitors key. Can be created with ceph-authtool --gen-print-key.
     type: string
+    hidden: true
   CephAdminKey:
     default: ''
     description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
     type: string
+    hidden: true
   CephMonitors:
     default: ''
     description: The list of ip/names to use as Ceph monitors
diff --git a/os-apply-config/cinder-storage.yaml b/os-apply-config/cinder-storage.yaml
index 7a686970..7f1164c4 100644
--- a/os-apply-config/cinder-storage.yaml
+++ b/os-apply-config/cinder-storage.yaml
@@ -87,6 +87,7 @@ parameters:
   RabbitPassword:
     default: 'guest'
     type: string
+    hidden: true
   RabbitUserName:
     default: 'guest'
     type: string
diff --git a/os-apply-config/compute.yaml b/os-apply-config/compute.yaml
index 88d4cb2b..0a74cda9 100644
--- a/os-apply-config/compute.yaml
+++ b/os-apply-config/compute.yaml
@@ -181,6 +181,7 @@ parameters:
     default: 'unset'
     description: Shared secret to prevent spoofing
     type: string
+    hidden: true
   NeutronCorePlugin:
     default: "ml2"
     description: |
diff --git a/os-apply-config/controller.yaml b/os-apply-config/controller.yaml
index 18dcc8eb..d9a9d338 100644
--- a/os-apply-config/controller.yaml
+++ b/os-apply-config/controller.yaml
@@ -215,9 +215,11 @@ parameters:
   HeatAuthEncryptionKey:
     description: Auth encryption key for heat-engine
     type: string
+    hidden: true
   HorizonSecret:
     description: Secret key for Django
     type: string
+    hidden: true
   Image:
     type: string
     default: overcloud-control
@@ -317,6 +319,7 @@ parameters:
     default: 'unset'
     description: Shared secret to prevent spoofing
     type: string
+    hidden: true
   NeutronCorePlugin:
     default: 'ml2'
     description: |
@@ -434,6 +437,7 @@ parameters:
   PcsdPassword:
     type: string
     description: The password for the 'pcsd' user.
+    hidden: true
   PublicVirtualInterface:
     default: 'br-ex'
     description: >
-- 
cgit 1.2.3-korg