diff options
| -rw-r--r-- | os-apply-config/ceph-storage.yaml | 2 | ||||
| -rw-r--r-- | os-apply-config/cinder-storage.yaml | 1 | ||||
| -rw-r--r-- | os-apply-config/compute.yaml | 1 | ||||
| -rw-r--r-- | os-apply-config/controller.yaml | 4 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 4 | ||||
| -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 |
9 files changed, 20 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: > diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 9605f3f3..66cb4599 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -38,10 +38,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 CinderEnableNfsBackend: default: false description: Whether to enable or not the NFS backend for Cinder @@ -50,6 +52,7 @@ parameters: default: '' description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring. type: string + hidden: true CephExternalMonHost: default: '' type: string @@ -158,6 +161,7 @@ parameters: default: 'unset' description: Shared secret to prevent spoofing type: string + hidden: true NeutronTunnelTypes: default: 'vxlan' description: | 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: '' |