Skip to content

Commit 5440ac0

Browse files
emontyemonty
committed
Install quantumclient from git before quantum.
There is an issue with installing git dependency_links via setuptools develop command. We're working on it generally, but for now this will make quantum happier with devstack. Change-Id: I8df88f4bca9f2b43b1d56fc7e77e26793b4c4b9f
1 parent 7398f94 commit 5440ac0

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

‎stack.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -646,14 +646,13 @@ if is_service_enabled horizon; then
646646
# django powered web control panel for openstack
647647
git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG
648648
fi
649+
if is_service_enabled quantum; then
650+
git_clone $QUANTUM_CLIENT_REPO $QUANTUM_CLIENT_DIR $QUANTUM_CLIENT_BRANCH
651+
fi
649652
if is_service_enabled q-svc; then
650653
# quantum
651654
git_clone $QUANTUM_REPO $QUANTUM_DIR $QUANTUM_BRANCH
652655
fi
653-
if is_service_enabled quantum; then
654-
git_clone $QUANTUM_CLIENT_REPO $QUANTUM_CLIENT_DIR $QUANTUM_CLIENT_BRANCH
655-
fi
656-
657656
if is_service_enabled m-svc; then
658657
# melange
659658
git_clone $MELANGE_REPO $MELANGE_DIR $MELANGE_BRANCH
@@ -684,12 +683,12 @@ cd $NOVA_DIR; sudo python setup.py develop
684683
if is_service_enabled horizon; then
685684
cd $HORIZON_DIR; sudo python setup.py develop
686685
fi
687-
if is_service_enabled q-svc; then
688-
cd $QUANTUM_DIR; sudo python setup.py develop
689-
fi
690686
if is_service_enabled quantum; then
691687
cd $QUANTUM_CLIENT_DIR; sudo python setup.py develop
692688
fi
689+
if is_service_enabled q-svc; then
690+
cd $QUANTUM_DIR; sudo python setup.py develop
691+
fi
693692
if is_service_enabled m-svc; then
694693
cd $MELANGE_DIR; sudo python setup.py develop
695694
fi

0 commit comments

Comments
 (0)