Skip to content

Commit b28bc4e

Browse files
committed
script/stackenv: Run through shellcheck, enable verbosity
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent a73ddcd commit b28bc4e

File tree

1 file changed

+42
-17
lines changed

1 file changed

+42
-17
lines changed

script/stackenv

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
# environment variables. This env is used for the CI jobs and you might need
55
# to modify this according to your setup
66

7+
set -euxo pipefail
8+
79
DEVSTACK_PATH=${DEVSTACK_PATH:-/opt/stack/new/devstack}
8-
pushd $DEVSTACK_PATH
10+
11+
pushd "$DEVSTACK_PATH"
12+
13+
set +u
14+
# shellcheck disable=SC1091
915
source openrc admin admin
16+
set -u
1017

1118
if [[ "${USE_SYSTEM_SCOPE:-}" == "true" ]]; then
1219
# use system-scoped tokens
@@ -26,28 +33,46 @@ fi
2633
# names rather than openrc file currently used.
2734
echo export OS_DOMAIN_ID=default >> openrc
2835

29-
openstack flavor create m1.acctest --id 99 --ram 512 --disk 10 --vcpu 1 --ephemeral 10
30-
openstack flavor create m1.resize --id 98 --ram 512 --disk 11 --vcpu 1 --ephemeral 10
36+
_FLAVOR_ID=99
37+
_FLAVOR_ALT_ID=98
38+
openstack flavor create m1.acctest --id "$_FLAVOR_ID" --ram 512 --disk 10 --vcpu 1 --ephemeral 10
39+
openstack flavor create m1.resize --id "$_FLAVOR_ALT_ID" --ram 512 --disk 11 --vcpu 1 --ephemeral 10
3140
openstack keypair create magnum
3241
_NETWORK_ID=$(openstack network show private -c id -f value)
3342
_SUBNET_ID=$(openstack subnet show private-subnet -c id -f value)
3443
_EXTGW_ID=$(openstack network show public -c id -f value)
3544
_IMAGE=$(openstack image list | grep -i cirros | head -n 1)
36-
_IMAGE_ID=$(echo $_IMAGE | awk -F\| '{print $2}' | tr -d ' ')
37-
_IMAGE_NAME=$(echo $_IMAGE | awk -F\| '{print $3}' | tr -d ' ')
38-
_MAGNUM_IMAGE_ID=$(openstack image list --format value -c Name -c ID | grep coreos | cut -d ' ' -f 1)
39-
if [ -z "$_MAGNUM_IMAGE_ID" ]; then
45+
_IMAGE_ID=$(echo "$_IMAGE" | awk -F\| '{print $2}' | tr -d ' ')
46+
_IMAGE_NAME=$(echo "$_IMAGE" | awk -F\| '{print $3}' | tr -d ' ')
47+
48+
cat >> "openrc" <<EOL
49+
50+
# gophercloud-specific configuration
51+
52+
export OS_IMAGE_NAME="$_IMAGE_NAME"
53+
export OS_IMAGE_ID="$_IMAGE_ID"
54+
export OS_NETWORK_ID="$_NETWORK_ID"
55+
export OS_SUBNET_ID="$_SUBNET_ID"
56+
export OS_EXTGW_ID="$_EXTGW_ID"
57+
export OS_POOL_NAME="public"
58+
export OS_FLAVOR_ID="$_FLAVOR_ID"
59+
export OS_FLAVOR_ID_RESIZE="$_FLAVOR_ALT_ID"
60+
EOL
61+
62+
if _=$(openstack service list | grep container-infra); then
63+
_MAGNUM_IMAGE_ID=$(openstack image list --format value -c Name -c ID | grep coreos | cut -d ' ' -f 1)
64+
if [ -z "$_MAGNUM_IMAGE_ID" ]; then
4065
_MAGNUM_IMAGE_ID=$(openstack image list --format value -c Name -c ID | grep -i atomic | cut -d ' ' -f 1)
66+
fi
67+
cat >> "openrc" <<EOL
68+
export OS_MAGNUM_IMAGE_ID="$_MAGNUM_IMAGE_ID"
69+
export OS_MAGNUM_KEYPAIR=magnum
70+
EOL
4171
fi
42-
echo export OS_IMAGE_NAME="$_IMAGE_NAME" >> openrc
43-
echo export OS_IMAGE_ID="$_IMAGE_ID" >> openrc
44-
echo export OS_NETWORK_ID="$_NETWORK_ID" >> openrc
45-
echo export OS_SUBNET_ID="$_SUBNET_ID" >> openrc
46-
echo export OS_EXTGW_ID="$_EXTGW_ID" >> openrc
47-
echo export OS_POOL_NAME="public" >> openrc
48-
echo export OS_FLAVOR_ID=99 >> openrc
49-
echo export OS_FLAVOR_ID_RESIZE=98 >> openrc
50-
echo export OS_MAGNUM_IMAGE_ID="$_MAGNUM_IMAGE_ID" >> openrc
51-
echo export OS_MAGNUM_KEYPAIR=magnum >> openrc
72+
73+
set +u
74+
# shellcheck disable=SC1091
5275
source openrc admin admin
76+
set -u
77+
5378
popd

0 commit comments

Comments
 (0)