This makes sure that the openstack client placement plugin gets
installed when either LIBS_FROM_GIT includes osc-placement or
placement is used, which is always now if you've enabled nova,
which is enabled by default.
Co-Authored-By: Matt Riedemann <mriedem.os@gmail.com>
Depends-On: Ica83e29780722dd1555904e46b9ff1d1fdf72516
Change-Id: I7c5a5c10288b356302bb3027837d4ed4f0fbad8c
... | ... |
@@ -30,6 +30,7 @@ GITDIR["debtcollector"]=$DEST/debtcollector |
30 | 30 |
GITDIR["futurist"]=$DEST/futurist |
31 | 31 |
GITDIR["os-client-config"]=$DEST/os-client-config |
32 | 32 |
GITDIR["osc-lib"]=$DEST/osc-lib |
33 |
+GITDIR["osc-placement"]=$DEST/osc-placement |
|
33 | 34 |
GITDIR["oslo.cache"]=$DEST/oslo.cache |
34 | 35 |
GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency |
35 | 36 |
GITDIR["oslo.config"]=$DEST/oslo.config |
... | ... |
@@ -91,6 +92,7 @@ function install_libs { |
91 | 91 |
_install_lib_from_source "debtcollector" |
92 | 92 |
_install_lib_from_source "futurist" |
93 | 93 |
_install_lib_from_source "osc-lib" |
94 |
+ _install_lib_from_source "osc-placement" |
|
94 | 95 |
_install_lib_from_source "os-client-config" |
95 | 96 |
_install_lib_from_source "oslo.cache" |
96 | 97 |
_install_lib_from_source "oslo.concurrency" |
... | ... |
@@ -159,6 +159,9 @@ function init_placement { |
159 | 159 |
# install_placement() - Collect source and prepare |
160 | 160 |
function install_placement { |
161 | 161 |
install_apache_wsgi |
162 |
+ # Install the openstackclient placement client plugin for CLI |
|
163 |
+ # TODO(mriedem): Use pip_install_gr once osc-placement is in g-r. |
|
164 |
+ pip_install osc-placement |
|
162 | 165 |
} |
163 | 166 |
|
164 | 167 |
# start_placement_api() - Start the API processes ahead of other things |
... | ... |
@@ -388,6 +388,10 @@ GITBRANCH["python-openstackclient"]=${OPENSTACKCLIENT_BRANCH:-master} |
388 | 388 |
# this doesn't exist in a lib file, so set it here |
389 | 389 |
GITDIR["python-openstackclient"]=$DEST/python-openstackclient |
390 | 390 |
|
391 |
+# placement-api CLI |
|
392 |
+GITREPO["osc-placement"]=${OSC_PLACEMENT_REPO:-${GIT_BASE}/openstack/osc-placement.git} |
|
393 |
+GITBRANCH["osc-placement"]=${OSC_PLACEMENT_BRANCH:-master} |
|
394 |
+ |
|
391 | 395 |
|
392 | 396 |
################### |
393 | 397 |
# |
... | ... |
@@ -36,7 +36,8 @@ ALL_LIBS+=" oslo.messaging oslo.log cliff 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 osc-lib os-client-config oslo.rootwrap" |
|
39 |
+ALL_LIBS+=" python-openstackclient osc-lib osc-placement" |
|
40 |
+ALL_LIBS+=" os-client-config oslo.rootwrap" |
|
40 | 41 |
ALL_LIBS+=" oslo.i18n oslo.utils python-openstacksdk python-swiftclient" |
41 | 42 |
ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy" |
42 | 43 |
ALL_LIBS+=" debtcollector os-brick os-traits automaton futurist oslo.service" |