From 15b4979453ac9e85dc8e03d30d7ca440179dfc73 Mon Sep 17 00:00:00 2001
From: "Schmalzried, Terry (ts862m)" <ts862m@att.com>
Date: Fri, 21 Aug 2020 15:59:22 -0400
Subject: Set Cloudify password

Cloudify pod updates for sourcing password from CMPASS environment variable.

Issue-ID: DCAEGEN2-1975
Change-Id: I5f297af9ad92389d0901eee463ea175751853838
Signed-off-by: Schmalzried, Terry (ts862m) <ts862m@att.com>
---
 cm-container/scripts/cloudify-ready.sh | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'cm-container/scripts/cloudify-ready.sh')

diff --git a/cm-container/scripts/cloudify-ready.sh b/cm-container/scripts/cloudify-ready.sh
index 60b48e6..0cb3e6e 100644
--- a/cm-container/scripts/cloudify-ready.sh
+++ b/cm-container/scripts/cloudify-ready.sh
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.dcae
 # ================================================================================
-# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,14 +41,32 @@
 # | Riemann                        | running |
 # +--------------------------------+---------+
 #
-# When an individual service is not running, it will have a status other than "running".
+# or:
+#
+# cfy status
+# Retrieving manager services status... [ip=dcae-cloudify-manager]
+#
+# Services:
+# +--------------------------------+--------+
+# |            service             | status |
+# +--------------------------------+--------+
+# | Cloudify Console               | Active |
+# | PostgreSQL                     | Active |
+# | AMQP-Postgres                  | Active |
+# | Manager Rest-Service           | Active |
+# | RabbitMQ                       | Active |
+# | Webserver                      | Active |
+# | Management Worker              | Active |
+# +--------------------------------+--------+
+#
+# When an individual service is not running, it will have a status other than "running" or "Active".
 # If the Cloudify API cannot be reached, the "Services:" line will not appear.
 
 STAT=$(cfy status)
 if (echo "${STAT}" | grep "^Services:$")
 then
    echo "Got a status response"
-   if !(echo "${STAT}" | egrep '^\| [[:alnum:]]+'| grep -iv '| running ')
+   if !(echo "${STAT}" | egrep '^\| [[:alnum:]]+'| egrep -iv ' Active | running ')
    then
       echo "All services running"
       exit 0
-- 
cgit 1.2.3-korg