openstack
/
magnum
Code Issues Proposed changes

Fix gate: caused by tempest(removal of "service" param) 

Tempest removed "service" param from Manager class in
following patch:-
https://review.openstack.org/#/c/416699

The use of "service" param is removed with this patch.

Note: Backported straight from stable/ocata since this change
is already part of 73212dbe39 in
stable/newton.

(cherry picked from commit 6950c34045)

Fix mesos gate

Use DEVSTACK_LOCAL_CONFIG istead of localrc to pass
MAGNUM_IMAGE_URL.

Conflicts:
	magnum/tests/contrib/gate_hook.sh
(cherry picked from commit fb67f87f12)

Co-Authored-By: Johannes Grassler <johannes.grassler@suse.com>
Co-Authored-By: Spyros Trigazis <strigazi@gmail.com>
Co-Authored-By: yatin <yatin.karel@nectechnologies.in>

Change-Id: I67f79efd2049c05d36ea56691b664417ed358fd8
This commit is contained in:
yatin 2017-01-05 15:59:31 +05:30 committed by Spyros Trigazis
parent 5ac9dfd46a
commit 3d3d24526b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/tests/contrib/gate_hook.sh
View File

@ -22,7 +22,7 @@ export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/opens
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
if [ "$coe" = "mesos" ]; then
echo "MAGNUM_GUEST_IMAGE_URL="https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2"" >> $BASE/new/devstack/localrc
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2"
fi
$BASE/new/devstack-gate/devstack-vm-gate.sh

2
magnum/tests/functional/common/manager.py
View File

@ -26,7 +26,7 @@ class Manager(clients.Manager):
if not credentials:
credentials = common_creds.get_configured_credentials(
'identity_admin')
super(Manager, self).__init__(credentials, 'container')
super(Manager, self).__init__(credentials)
self.auth_provider.orig_base_url = self.auth_provider.base_url
self.auth_provider.base_url = self.bypassed_base_url
if request_type == 'baymodel':