summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorMatt Riedemann <mriedem.os@gmail.com>2017-10-17 09:43:46 -0400
committerMatt Riedemann <mriedem.os@gmail.com>2017-10-17 09:45:28 -0400
commit9f1f729d6053b2f9fd92e3ff28aa6df3ec6678fe (patch)
treec0970bb17570770a85e78778c56c676a78cccb11 /devstack
parentc4ddabdd1b202f474e4b988cecf7685b76c467f8 (diff)
Conditionally install python3 packages
We should only attempt to install the python3 packages if we're running in a python3 environment. Change-Id: Ic5e3046917a51d884091b449a433259c049ac016 Closes-Bug: #1724249
Notes
Notes (review): Code-Review+2: Ramana Raja <rraja@redhat.com> Workflow+1: Jon Bernard <jobernar@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 17 Oct 2017 16:37:37 +0000 Reviewed-on: https://review.openstack.org/512622 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ceph5
1 files changed, 4 insertions, 1 deletions
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 9da2c0b..73405fe 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -831,7 +831,10 @@ function install_ceph_remote {
831 831
832function install_ceph { 832function install_ceph {
833 if is_ubuntu; then 833 if is_ubuntu; then
834 CEPH_PACKAGES="ceph libnss3-tools python3-rados python3-rbd" 834 CEPH_PACKAGES="ceph libnss3-tools"
835 if python3_enabled; then
836 CEPH_PACKAGES="$CEPH_PACKAGES python3-rados python3-rbd"
837 fi
835 install_package software-properties-common 838 install_package software-properties-common
836 839
837 if is_ceph_enabled_for_service manila; then 840 if is_ceph_enabled_for_service manila; then