summaryrefslogtreecommitdiffstats
path: root/os-apply-config
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-14 09:27:36 +0000
committerGerrit Code Review <review@openstack.org>2015-10-14 09:27:36 +0000
commite161d63e0f5d2c2e6f4b0f52449d6a4b5e1d8ea0 (patch)
tree3e3d2157155d901b27e387b01a57f1db3f8ebcc3 /os-apply-config
parenta3763aae276ad12e6762e98f8e44d24492c70ed9 (diff)
parentfa4ed015b083dfe416aaf2cd666ca666284608ce (diff)
Merge "Set shared secrets, keys and passwords as hidden"
Diffstat (limited to 'os-apply-config')
-rw-r--r--os-apply-config/ceph-storage.yaml2
-rw-r--r--os-apply-config/cinder-storage.yaml1
-rw-r--r--os-apply-config/compute.yaml1
-rw-r--r--os-apply-config/controller.yaml4
4 files changed, 8 insertions, 0 deletions
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 a317d7a0..f289d9b5 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: >