summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-16 13:24:21 +0000
committerGerrit Code Review <review@openstack.org>2017-03-16 13:24:21 +0000
commit56930d685d1afb8cf854ac09774385fdaca335cd (patch)
treed681d9acea6c42e6ac3ce27946adf6f52bb0bab5
parente166e3131df4e88a643a4bda9c242adde298e94e (diff)
parent55d17ca118d27f16b57424774265f5b3db7b7b52 (diff)
Merge "etcd: secure EtcdInitialClusterToken parameter"
-rw-r--r--puppet/services/etcd.yaml2
-rw-r--r--releasenotes/notes/etcdtoken-4c46bdfac940acda.yaml6
2 files changed, 7 insertions, 1 deletions
diff --git a/puppet/services/etcd.yaml b/puppet/services/etcd.yaml
index 7cdd8451..5db8bec0 100644
--- a/puppet/services/etcd.yaml
+++ b/puppet/services/etcd.yaml
@@ -19,9 +19,9 @@ parameters:
via parameter_defaults in the resource registry.
type: json
EtcdInitialClusterToken:
- default: 'etcd-tripleo'
description: Initial cluster token for the etcd cluster during bootstrap.
type: string
+ hidden: true
MonitoringSubscriptionEtcd:
default: 'overcloud-etcd'
type: string
diff --git a/releasenotes/notes/etcdtoken-4c46bdfac940acda.yaml b/releasenotes/notes/etcdtoken-4c46bdfac940acda.yaml
new file mode 100644
index 00000000..da995949
--- /dev/null
+++ b/releasenotes/notes/etcdtoken-4c46bdfac940acda.yaml
@@ -0,0 +1,6 @@
+---
+security:
+ - |
+ Secure EtcdInitialClusterToken by removing the default value
+ and make the parameter hidden.
+ Fixes `bug 1673266 <https://bugs.launchpad.net/tripleo/+bug/1673266>`__.