summaryrefslogtreecommitdiff
path: root/integration
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-12-06 09:57:17 +0000
committerGerrit Code Review <review@openstack.org>2019-12-06 09:57:17 +0000
commit94331620a3e8607e63723e5e408fbd43aa6fc33f (patch)
treec6284bac322a84259098ef87134f94f4848b0aed /integration
parent637c900b875fd52a6ebf25848972469f6abb23fc (diff)
parentd5549f30cfd6ed5d211d1e1e73ce04a3921a3601 (diff)
downloadtrove-94331620a3e8607e63723e5e408fbd43aa6fc33f.tar.gz
Merge "Support pip3 and run on guest-agent service for redis"
Diffstat (limited to 'integration')
-rwxr-xr-xintegration/scripts/files/elements/ubuntu-redis/install.d/30-redis2
-rwxr-xr-xintegration/scripts/files/elements/ubuntu-redis/install.d/80-fix-in-guest-agent-env11
2 files changed, 12 insertions, 1 deletions
diff --git a/integration/scripts/files/elements/ubuntu-redis/install.d/30-redis b/integration/scripts/files/elements/ubuntu-redis/install.d/30-redis
index b3ff9569..24d60d2c 100755
--- a/integration/scripts/files/elements/ubuntu-redis/install.d/30-redis
+++ b/integration/scripts/files/elements/ubuntu-redis/install.d/30-redis
@@ -113,4 +113,4 @@ ULIMIT=65536
_EOF_
# Install Python driver for Redis ('redis-py').
-pip2 install redis
+pip3 install redis
diff --git a/integration/scripts/files/elements/ubuntu-redis/install.d/80-fix-in-guest-agent-env b/integration/scripts/files/elements/ubuntu-redis/install.d/80-fix-in-guest-agent-env
new file mode 100755
index 00000000..088dc70c
--- /dev/null
+++ b/integration/scripts/files/elements/ubuntu-redis/install.d/80-fix-in-guest-agent-env
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# PURPOSE: Install redis required package in guest-agent-venv
+
+set -ex
+
+if [ $GUEST_VENV ]
+then
+ # Install Python driver for Redis ('redis-py').
+ $GUEST_VENV/bin/pip3 install redis
+fi