Skip to content

Commit

Permalink
Fixes liberty MNAIO, adds default_glance_store
Browse files Browse the repository at this point in the history
Adds glance_default_store and a user_gating_fixes.yml
config file to push configuration changes needed to
pass gating down to the mnaio.

Default liberty install didn't specify the glance values
causing the switch to mnaio to fail.
  • Loading branch information
Antony Messerli committed Feb 5, 2019
1 parent 73cbf5e commit e473393
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tests/create-mnaio-snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export RE_JOB_IMAGE_TYPE="${RE_JOB_IMAGE_TYPE:-mnaio}"

# remove snap from RE_JOB_IMAGE_TYPE var so that we can grab the proper image
export RE_JOB_IMAGE_TYPE="${RE_JOB_IMAGE_TYPE//-snap}"

export RPC_RELEASE="${RE_JOB_CONTEXT:-}"
export RPCU_ARTIFACT_URL="https://ed2cc5ce4ea792952a06-5946b1c04934c7963c5365082354649f.ssl.cf5.rackcdn.com"
export RPCU_IMAGE_MANIFEST_URL="${RPCU_ARTIFACT_URL}/${RE_JOB_CONTEXT}-${RE_JOB_IMAGE_OS}_${RE_JOB_IMAGE_TYPE}-${RE_JOB_SCENARIO}/manifest.json"
Expand Down
3 changes: 3 additions & 0 deletions tests/create-mnaio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ uname -a
scp -r -o StrictHostKeyChecking=no /opt/rpc-openstack infra1:/opt/
scp -r -o StrictHostKeyChecking=no /opt/rpc-upgrades infra1:/opt/
scp -r -o StrictHostKeyChecking=no /etc/openstack_deploy/user_rpco_upgrade.yml infra1:/etc/openstack_deploy/
if [ -f /etc/openstack_deploy/user_gating_fixes.yml ]; then
scp -r -o StrictHostKeyChecking=no /etc/openstack_deploy/user_gating_fixes.yml infra1:/etc/openstack_deploy/
fi
if [ -f /etc/openstack_deploy/user_osa_variables_spice.yml ]; then
scp -r -o StrictHostKeyChecking=no /etc/openstack_deploy/user_osa_variables_spice.yml infra1:/etc/openstack_deploy/
fi
Expand Down
8 changes: 8 additions & 0 deletions tests/prepare-rpco.sh
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,13 @@ function remove_ceph_roles {
sed -i '/# This removes Ceph roles downloaded/,+4d' ${RPCO_PATH}/scripts/deploy.sh
}

function fixup_liberty {
cat > /etc/openstack_deploy/user_gating_fixes.yml <<EOF
---
glance_default_store: swift
EOF
}

function fixup_mitaka {
sed -i '/# Enable playbook callbacks from OSA/,+1d' ${RPCO_PATH}/scripts/deploy.sh
sed -i '/# Apply any patched files./,+2d' ${RPCO_PATH}/scripts/deploy.sh
Expand Down Expand Up @@ -383,6 +390,7 @@ pushd /opt/rpc-openstack
unset_affinity
allow_frontloading_vars
get_ssh_role
fixup_liberty
fix_galera_apt_cache
remove_xtrabackup_from_galera_client
remove_ceph_roles
Expand Down

0 comments on commit e473393

Please sign in to comment.