Skip to content

Replace WaitCondition with UpdateWaitConditio to support host replace… #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace WaitCondition with UpdateWaitConditio to support host replace… #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions fragments/common_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
# Send success status to OpenStack WaitCondition
# or UpdateWaitConditionHandle
function notify_success() {
$WC_NOTIFY --data-binary \
"{\"status\": \"SUCCESS\", \"reason\": \"$1\", \"data\": \"$1\"}"
if [[ "$WC_NOTIFY" =~ ^curl ]]; then
$WC_NOTIFY -k --data-binary \
"{\"status\": \"SUCCESS\", \"reason\": \"$1\", \"data\": \"$1\"}"
else
/usr/bin/cfn-signal -e 0 -r "$1" -s "SUCCESS" --id "00000" -d "$1" "$WC_NOTIFY"
fi
exit 0
}

# Send success status to OpenStack WaitCondition
# Send failure status to OpenStack WaitCondition
# or UpdateWaitConditionHandle
function notify_failure() {
$WC_NOTIFY --data-binary \
if [[ "$WC_NOTIFY" =~ ^curl ]]; then

$WC_NOTIFY -k --data-binary \
"{\"status\": \"FAILURE\", \"reason\": \"$1\", \"data\": \"$1\"}"
else
/usr/bin/cfn-signal -r "$1" -s "FAILURE" -r "$1" --id "00000" -d "$1" "$WC_NOTIFY"
fi
exit 1
}

Expand Down
4 changes: 2 additions & 2 deletions node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ resources:
content:
str_replace:
params:
$WC_NOTIFY: { get_attr: ['wait_handle', 'curl_cli'] }
$WC_NOTIFY: { get_resource: wait_handle }
template: {get_file: fragments/common_functions.sh}
- path: /usr/local/share/openshift-on-openstack/common_openshift_functions.sh
permissions: 0755
Expand Down Expand Up @@ -766,7 +766,7 @@ resources:
# Provide a curl CLI command to the cloud-init script. Called on completion
# to indicate the status of the cloud-init process
wait_handle:
type: OS::Heat::WaitConditionHandle
type: OS::Heat::UpdateWaitConditionHandle

outputs:
hostname:
Expand Down