summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyen Van Trung <trungnvfet@outlook.com>2019-10-19 23:58:26 +0700
committerLingxian Kong <anlin.kong@gmail.com>2019-12-05 09:35:12 +0000
commitd5549f30cfd6ed5d211d1e1e73ce04a3921a3601 (patch)
treedf66fb19e05a666ca888e88da281fb0a1a48f127
parent053820856807c2b6311d8c1da6e2f648000316a1 (diff)
downloadtrove-d5549f30cfd6ed5d211d1e1e73ce04a3921a3601.tar.gz
Support pip3 and run on guest-agent service for redis
This patch will solve some following items: - Support python3/ pip3 - Permit redis is running with guest-agent service Tested with standalone, replicate and cluster successfully. Change-Id: I81b72fae1c31ce2995232b52460d0ad0d6f894be
-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