summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2/components/dcae-deployment-handler/templates
diff options
context:
space:
mode:
authorSchmalzried, Terry (ts862m) <ts862m@att.com>2020-08-21 20:42:33 -0400
committerJack Lucas <jflos@sonoris.net>2020-09-25 10:58:40 -0400
commit12db78947bd0a76ebfad5cd8e46d5174469207e7 (patch)
treeb10d9b7978a391f6e7c85b0d1b465faf4ee9793b /kubernetes/dcaegen2/components/dcae-deployment-handler/templates
parentb5520133fe86fbc7998b23cbde27f19c03789fe1 (diff)
[DCAEGEN2] Use common secret template for cloudify password
Link all references to cloudify password to ensure that it can be automatically generated. Set generated password strength to "basic" to work around problem with Cloudify (DCAEGEN2-2450). Issue-ID: DCAEGEN2-1975 Issue-ID: DCAEGEN2-2450 Change-Id: I53e154de854d33be686e830be8a827741bb3ec7e Signed-off-by: Schmalzried, Terry (ts862m) <ts862m@att.com> Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Signed-off-by: vv770d <vv770d@att.com>
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-deployment-handler/templates')
-rwxr-xr-xkubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml4
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/templates/secrets.yaml17
2 files changed, 19 insertions, 2 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
index 1a28bc45c0..88ec5cbe66 100755
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
@@ -1,6 +1,6 @@
#============LICENSE_START========================================================
# ================================================================================
-# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2020 Nokia
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -124,7 +124,7 @@ spec:
- name: CLOUDIFY_USER
value: admin
- name: CLOUDIFY_PASSWORD
- value: admin
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cm-pass" "key" "password") | indent 14 }}
- name: CONFIG_BINDING_SERVICE
value: config-binding-service
- name: NODE_EXTRA_CA_CERTS
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/secrets.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/secrets.yaml
new file mode 100644
index 0000000000..34932b713d
--- /dev/null
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/secrets.yaml
@@ -0,0 +1,17 @@
+{{/*
+# Copyright © 2020 Samsung Electronics
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+{{ include "common.secretFast" . }}