Skip to content

openstack: Fix unbound variables #6728

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

Merged
openshift-merge-robot merged 2 commits into from
Jan 16, 2020
Merged

openstack: Fix unbound variables #6728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44289bc
openstack: Allow bash syntax in script
pierreprinetti Jan 16, 2020
8b6c24e
openstack: Fix unbound variable
pierreprinetti Jan 16, 2020
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
6 changes: 3 additions & 3 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,10 @@ objects:
- name: INSTALL_INITIAL_RELEASE
- name: RELEASE_IMAGE_INITIAL
command:
- /bin/sh
- /bin/bash
- -c
- |
#!/bin/sh
#!/bin/bash
set -euo pipefail

trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
Expand Down Expand Up @@ -376,7 +376,7 @@ objects:
# What we're doing here is we generate manifests first and force that OpenShift SDN is configured. Kuryr is only
# allowed when KURYR_ENABLED variable is set to "true".
TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug
if [[ $KURYR_ENABLED != "true" ]]; then
if [[ "${KURYR_ENABLED:-false}" != "true" ]]; then
echo "Forcing OpenShiftSDN by modifying manifests"
sed -i -e 's/networkType: .*$/networkType: OpenShiftSDN/g' /tmp/artifacts/installer/manifests/cluster-network-02-config.yml
fi
Expand Down