openstack
/
magnum
Code Issues Proposed changes

Merge "Use lowercase keys for swarm waitcondition signal"

This commit is contained in:
Jenkins 2017-06-16 12:36:19 +00:00 committed by Gerrit Code Review
parent 49ec3cb3fa 0dc463e391
commit e6da7152ab
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh
View File

@ -9,8 +9,8 @@ REASON="Setup complete"
DATA="OK"
UUID=`uuidgen`
data=$(echo '{"Status": "'${STATUS}'", "Reason": "'$REASON'", "Data": "'${DATA}'", "Id": "'$UUID'"}')
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'" \
--data-binary "$data" \
"$WAIT_HANDLE_ENDPOINT"

3
magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml
View File

@ -11,7 +11,6 @@ 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": "Failure", "Id": "$UUID"}'"'" \
--data-binary '{"status": "FAILURE", "reason": "$SERVICE service failed to start.", "data": "Failure"}' \
"$WAIT_HANDLE_ENDPOINT"

4
magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
View File

@ -67,6 +67,7 @@ chmod 644 $CONF_FILE
SCRIPT=/usr/local/bin/notify-heat
UUID=`uuidgen`
cat > $SCRIPT << EOF
#!/bin/sh
until etcdctl \
@ -79,9 +80,8 @@ 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", "Id": "'${UUID}'"}'"'" \
--data-binary '{"status": "SUCCESS", "reason": "Swarm agent ready", "data": "OK", "id": "${UUID}"}' \
"$WAIT_HANDLE_ENDPOINT"
EOF

2
magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
View File

@ -51,7 +51,7 @@ cat >> /etc/systemd/system/swarm-manager.service << END_SERVICE_BOTTOM
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", "Id": "$UUID"}'"'" \\
--data-binary '{"status": "SUCCESS", "reason": "Setup complete", "data": "OK", "id": "$UUID"}' \\
"$WAIT_HANDLE_ENDPOINT"
[Install]