From c489a5d47e7bbd5a0e3e96cf5990e481a000b9fc Mon Sep 17 00:00:00 2001
From: PanFengyun <fengyun.pan@easystack.cn>
Date: Fri, 16 Dec 2016 20:06:48 +0800
Subject: [PATCH] Use UUID instead of "00000" for UniqueId

The swarm bay should pass specified "UniqueId" to the resource of
OS::Heat::WaitConditionHandle, but the "UniqueId" is "00000" in
the templates of swarm. So let's use UUID instead of "00000".
In addition, "UniqueID" seems to be obsolete, Use "Id" instead.

Change-Id: I86739db4a2e6faf93d55fe4998bada110de118c6
Closes-Bug: #1606486
---
 magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh  | 3 ++-
 .../swarm/fragments/write-cluster-failure-service.yaml         | 3 ++-
 .../templates/swarm/fragments/write-swarm-agent-service.sh     | 3 ++-
 .../templates/swarm/fragments/write-swarm-master-service.sh    | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh b/magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh
index 17c0f08641..15cb35f212 100644
--- a/magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh
+++ b/magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh
@@ -7,8 +7,9 @@ echo "notifying heat"
 STATUS="SUCCESS"
 REASON="Setup complete"
 DATA="OK"
+UUID=`uuidgen`
 
-data=$(echo '{"Status": "'${STATUS}'", "Reason": "'$REASON'", "Data": "'${DATA}'", "UniqueId": "00000"}')
+data=$(echo '{"Status": "'${STATUS}'", "Reason": "'$REASON'", "Data": "'${DATA}'", "Id": "'$UUID'"}')
 
 curl -k -i -X POST -H "Content-Type: application/json" -H "X-Auth-Token: $WAIT_HANDLE_TOKEN" \
     --data-binary "'$data'" \
diff --git a/magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml b/magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml
index f27141a981..245a3b705e 100644
--- a/magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml
+++ b/magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml
@@ -11,6 +11,7 @@ write_files:
       [Service]
       Type=simple
       TimeoutStartSec=0
+      UUID=`uuidgen`
       ExecStart=/usr/bin/curl -k -i -X POST -H 'Content-Type: application/json' -H 'X-Auth-Token: $WAIT_HANDLE_TOKEN' \
-        --data-binary "'"'{"Status": "FAILURE", "Reason": "$SERVICE service failed to start.", "Data": "OK", "UniqueId": "00000"}'"'" \
+        --data-binary "'"'{"Status": "FAILURE", "Reason": "$SERVICE service failed to start.", "Data": "Failure", "Id": "$UUID"}'"'" \
         "$WAIT_HANDLE_ENDPOINT"
diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
index 3b90d0c496..6879194636 100644
--- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
+++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
@@ -51,8 +51,9 @@ do
     sleep 5
 done
 
+UUID=`uuidgen`
 curl -k -i -X POST -H 'Content-Type: application/json' -H 'X-Auth-Token: $WAIT_HANDLE_TOKEN' \
-    --data-binary "'"'{"Status": "SUCCESS", "Reason": "Swarm agent ready", "Data": "OK", "UniqueId": "00000"}'"'" \
+    --data-binary "'"'{"Status": "SUCCESS", "Reason": "Swarm agent ready", "Data": "OK", "Id": "'${UUID}'"}'"'" \
     "$WAIT_HANDLE_ENDPOINT"
 EOF
 
diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
index 67b9d00924..7944ce1549 100644
--- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
+++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
@@ -36,12 +36,13 @@ END_TLS
 
 fi
 
+UUID=`uuidgen`
 cat >> /etc/systemd/system/swarm-manager.service << END_SERVICE_BOTTOM
                                   etcd://$ETCD_SERVER_IP:2379/v2/keys/swarm/
 ExecStop=/usr/bin/docker stop swarm-manager
 Restart=always
 ExecStartPost=/usr/bin/curl -k -i -X POST -H 'Content-Type: application/json' -H 'X-Auth-Token: $WAIT_HANDLE_TOKEN' \\
-    --data-binary "'"'{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}'"'" \\
+    --data-binary "'"'{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "Id": "$UUID"}'"'" \\
     "$WAIT_HANDLE_ENDPOINT"
 
 [Install]