summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-09-19 23:49:04 +0000
committerGerrit Code Review <review@openstack.org>2019-09-19 23:49:04 +0000
commita67a6ed2ef8f8009722f05be8d941ee079646890 (patch)
tree7616f81836568db8b00fc08849f843a2b0670ad4
parent0cdf8b20b664abd26bd25483ead82eaf3640a36d (diff)
parent38efc9725190e5d991f6f2630285f46bce9525e1 (diff)
downloadtrove-a67a6ed2ef8f8009722f05be8d941ee079646890.tar.gz
Merge "Fix issue with pip2 command and update pip3 for mongodb"
-rwxr-xr-xintegration/scripts/files/elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key2
-rwxr-xr-xintegration/scripts/files/elements/ubuntu-trusty-mongodb/install.d/25-trove-mongo-dep2
-rwxr-xr-xintegration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep2
3 files changed, 3 insertions, 3 deletions
diff --git a/integration/scripts/files/elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key b/integration/scripts/files/elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key
index 43ed1b06..06aba978 100755
--- a/integration/scripts/files/elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key
+++ b/integration/scripts/files/elements/ubuntu-mongodb/pre-install.d/10-mongodb-apt-key
@@ -5,7 +5,7 @@ set -o xtrace
[ -n "${RELEASE}" ] || die "RELEASE must be set to either trusty or xenial"
-apt-get --allow-unauthenticated -y install software-properties-common
+apt-get --allow-unauthenticated -y install software-properties-common python3-pip
get_key_robust EA312927
diff --git a/integration/scripts/files/elements/ubuntu-trusty-mongodb/install.d/25-trove-mongo-dep b/integration/scripts/files/elements/ubuntu-trusty-mongodb/install.d/25-trove-mongo-dep
index a8b3ddc0..c0488bd0 100755
--- a/integration/scripts/files/elements/ubuntu-trusty-mongodb/install.d/25-trove-mongo-dep
+++ b/integration/scripts/files/elements/ubuntu-trusty-mongodb/install.d/25-trove-mongo-dep
@@ -6,4 +6,4 @@
set -e
set -o xtrace
-pip2 install pymongo>=3.0.2,!=3.1
+pip3 install pymongo>=3.0.2,!=3.1
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep b/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep
index a8b3ddc0..c0488bd0 100755
--- a/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep
+++ b/integration/scripts/files/elements/ubuntu-xenial-mongodb/install.d/25-trove-mongo-dep
@@ -6,4 +6,4 @@
set -e
set -o xtrace
-pip2 install pymongo>=3.0.2,!=3.1
+pip3 install pymongo>=3.0.2,!=3.1