diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-07 12:25:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-07 12:25:06 +0000 |
| commit | 2f923d8cf404c373b059c8a08937a1c498113da2 (patch) | |
| tree | a146837a932fdaccb65af03ceaf845b5b397aa14 /nova | |
| parent | 8fa49fc35ec2ab730477af0a9f5fd5079e10d2dc (diff) | |
| parent | 8d30fbf22856c1b6b40b62ae7bbea056f261471f (diff) | |
| download | nova-2f923d8cf404c373b059c8a08937a1c498113da2.tar.gz | |
Merge "Fix live migration devstack hook for multicell environment"
Diffstat (limited to 'nova')
| -rwxr-xr-x | nova/tests/live_migration/hooks/ceph.sh | 2 | ||||
| -rwxr-xr-x | nova/tests/live_migration/hooks/run_tests.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/live_migration/hooks/ceph.sh b/nova/tests/live_migration/hooks/ceph.sh index e2edba04bf..0d2c8bb41a 100755 --- a/nova/tests/live_migration/hooks/ceph.sh +++ b/nova/tests/live_migration/hooks/ceph.sh @@ -70,7 +70,7 @@ function configure_and_start_glance { function _ceph_configure_nova { #setup ceph for nova, we don't reuse configure_ceph_nova - as we need to emulate case where cinder is not configured for ceph sudo ceph -c ${CEPH_CONF_FILE} osd pool create ${NOVA_CEPH_POOL} ${NOVA_CEPH_POOL_PG} ${NOVA_CEPH_POOL_PGP} - NOVA_CONF=${NOVA_CONF:-/etc/nova/nova.conf} + NOVA_CONF=${NOVA_CPU_CONF:-/etc/nova/nova.conf} $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=${NOVA_CONF} section=libvirt option=rbd_user value=${CINDER_CEPH_USER}" $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=${NOVA_CONF} section=libvirt option=rbd_secret_uuid value=${CINDER_CEPH_UUID}" $ANSIBLE all --sudo -f 5 -i "$WORKSPACE/inventory" -m ini_file -a "dest=${NOVA_CONF} section=libvirt option=inject_key value=false" diff --git a/nova/tests/live_migration/hooks/run_tests.sh b/nova/tests/live_migration/hooks/run_tests.sh index f6e5d62104..2595e85032 100755 --- a/nova/tests/live_migration/hooks/run_tests.sh +++ b/nova/tests/live_migration/hooks/run_tests.sh @@ -14,6 +14,7 @@ cd $BASE/new/tempest source $BASE/new/devstack/functions source $BASE/new/devstack/functions-common +source $BASE/new/devstack/lib/nova source $WORKSPACE/devstack-gate/functions.sh source $BASE/new/nova/nova/tests/live_migration/hooks/utils.sh source $BASE/new/nova/nova/tests/live_migration/hooks/nfs.sh |