diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-10-14 09:27:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-10-14 09:27:36 +0000 |
| commit | e161d63e0f5d2c2e6f4b0f52449d6a4b5e1d8ea0 (patch) | |
| tree | 3e3d2157155d901b27e387b01a57f1db3f8ebcc3 /puppet | |
| parent | a3763aae276ad12e6762e98f8e44d24492c70ed9 (diff) | |
| parent | fa4ed015b083dfe416aaf2cd666ca666284608ce (diff) | |
Merge "Set shared secrets, keys and passwords as hidden"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/cinder-storage.yaml | 1 | ||||
| -rw-r--r-- | puppet/compute.yaml | 1 | ||||
| -rw-r--r-- | puppet/controller.yaml | 4 | ||||
| -rw-r--r-- | puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml | 2 |
4 files changed, 8 insertions, 0 deletions
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 92524860..fe96236e 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -193,6 +193,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 @@ -200,6 +201,7 @@ parameters: HorizonSecret: description: Secret key for Django type: string + hidden: true Image: type: string default: overcloud-control @@ -307,6 +309,7 @@ parameters: default: 'unset' description: Shared secret to prevent spoofing type: string + hidden: true NeutronCorePlugin: default: 'ml2' description: | @@ -423,6 +426,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: '' |