From d1859915ab40b07c63f52da67af18145bf15244a Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 3 Jul 2018 09:55:26 -0400 Subject: [PATCH] Stop setting glance_api_version in cinder.conf in nova-live-migration The glance_api_version config option was removed from cinder in Queens [1] so we can stop setting it during the nova-live-migration CI job. [1] https://docs.openstack.org/releasenotes/cinder/queens.html Change-Id: Ifbadce909393268b340b7a08c78a6faa2d7888b2 --- nova/tests/live_migration/hooks/ceph.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/nova/tests/live_migration/hooks/ceph.sh b/nova/tests/live_migration/hooks/ceph.sh index b8c62724cff9..e5f46bb7741a 100755 --- a/nova/tests/live_migration/hooks/ceph.sh +++ b/nova/tests/live_migration/hooks/ceph.sh @@ -132,7 +132,6 @@ function _ceph_configure_cinder { $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=$CINDER_CONF section=ceph option=rbd_uuid value=$CINDER_CEPH_UUID" $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=$CINDER_CONF section=ceph option=rbd_flatten_volume_from_snapshot value=False" $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=$CINDER_CONF section=ceph option=rbd_max_clone_depth value=5" - $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=$CINDER_CONF section=DEFAULT option=glance_api_version value=2" $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=$CINDER_CONF section=DEFAULT option=default_volume_type value=ceph" $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=$CINDER_CONF section=DEFAULT option=enabled_backends value=ceph"