Browse code
Add os-client-config and osc-lib from source
There is currently a hole in our testing that lets os-client-config,
which sits at the bottom of the dependency chain for some key pieces
like neutronclient and python-openstackclient, introduce gate breakages.
Step one in fixing this is allowing os-client-config to be optionally
installed from source so that jobs can be put into its gate to exercise
its master vs devstack installs.
Additionally, osc-lib is a new and lovely library that's going to need
the same things.
We're putting both in install_oslo, even though they're not oslo
libraries, because that'll make grenade work properly.
Co-Authored-By: Monty Taylor <mordred@inaugust.com>
Change-Id: I747480b6063a62e82ca2b030f274d3e87bf28b3b
Dean Troyer authored on 2016/08/12 23:35:42Showing 3 changed files
| ... | ... |
@@ -26,6 +26,8 @@ GITDIR["automaton"]=$DEST/automaton |
| 26 | 26 |
GITDIR["cliff"]=$DEST/cliff |
| 27 | 27 |
GITDIR["debtcollector"]=$DEST/debtcollector |
| 28 | 28 |
GITDIR["futurist"]=$DEST/futurist |
| 29 |
+GITDIR["os-client-config"]=$DEST/os-client-config |
|
| 30 |
+GITDIR["osc-lib"]=$DEST/osc-lib |
|
| 29 | 31 |
GITDIR["oslo.cache"]=$DEST/oslo.cache |
| 30 | 32 |
GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency |
| 31 | 33 |
GITDIR["oslo.config"]=$DEST/oslo.config |
| ... | ... |
@@ -71,6 +73,8 @@ function install_oslo {
|
| 71 | 71 |
_do_install_oslo_lib "cliff" |
| 72 | 72 |
_do_install_oslo_lib "debtcollector" |
| 73 | 73 |
_do_install_oslo_lib "futurist" |
| 74 |
+ _do_install_oslo_lib "osc-lib" |
|
| 75 |
+ _do_install_oslo_lib "os-client-config" |
|
| 74 | 76 |
_do_install_oslo_lib "oslo.cache" |
| 75 | 77 |
_do_install_oslo_lib "oslo.concurrency" |
| 76 | 78 |
_do_install_oslo_lib "oslo.config" |
| ... | ... |
@@ -508,10 +508,19 @@ GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware |
| 508 | 508 |
GITREPO["os-brick"]=${OS_BRICK_REPO:-${GIT_BASE}/openstack/os-brick.git}
|
| 509 | 509 |
GITBRANCH["os-brick"]=${OS_BRICK_BRANCH:-master}
|
| 510 | 510 |
|
| 511 |
+# os-client-config to manage clouds.yaml and friends |
|
| 512 |
+GITREPO["os-client-config"]=${OS_CLIENT_CONFIG_REPO:-${GIT_BASE}/openstack/os-client-config.git}
|
|
| 513 |
+GITBRANCH["os-client-config"]=${OS_CLIENT_CONFIG_BRANCH:-master}
|
|
| 514 |
+GITDIR["os-client-config"]=$DEST/os-client-config |
|
| 515 |
+ |
|
| 511 | 516 |
# os-vif library to communicate between Neutron to Nova |
| 512 | 517 |
GITREPO["os-vif"]=${OS_VIF_REPO:-${GIT_BASE}/openstack/os-vif.git}
|
| 513 | 518 |
GITBRANCH["os-vif"]=${OS_VIF_BRANCH:-master}
|
| 514 | 519 |
|
| 520 |
+# osc-lib OpenStackClient common lib |
|
| 521 |
+GITREPO["osc-lib"]=${OSC_LIB_REPO:-${GIT_BASE}/openstack/osc-lib.git}
|
|
| 522 |
+GITBRANCH["osc-lib"]=${OSC_LIB_BRANCH:-master}
|
|
| 523 |
+ |
|
| 515 | 524 |
# ironic common lib |
| 516 | 525 |
GITREPO["ironic-lib"]=${IRONIC_LIB_REPO:-${GIT_BASE}/openstack/ironic-lib.git}
|
| 517 | 526 |
GITBRANCH["ironic-lib"]=${IRONIC_LIB_BRANCH:-master}
|
| ... | ... |
@@ -36,8 +36,8 @@ ALL_LIBS+=" oslo.messaging oslo.log cliff python-heatclient stevedore" |
| 36 | 36 |
ALL_LIBS+=" python-cinderclient glance_store oslo.concurrency oslo.db" |
| 37 | 37 |
ALL_LIBS+=" oslo.versionedobjects oslo.vmware keystonemiddleware" |
| 38 | 38 |
ALL_LIBS+=" oslo.serialization django_openstack_auth" |
| 39 |
-ALL_LIBS+=" python-openstackclient oslo.rootwrap oslo.i18n" |
|
| 40 |
-ALL_LIBS+=" oslo.utils python-swiftclient" |
|
| 39 |
+ALL_LIBS+=" python-openstackclient osc-lib os-client-config oslo.rootwrap" |
|
| 40 |
+ALL_LIBS+=" oslo.i18n oslo.utils python-swiftclient" |
|
| 41 | 41 |
ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy" |
| 42 | 42 |
ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service" |
| 43 | 43 |
ALL_LIBS+=" oslo.cache oslo.reports osprofiler" |