summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDivyang Patel <divyang.patel@team.telstra.com>2019-03-15 16:10:51 +1100
committerDivyang Patel <divyang.patel@team.telstra.com>2019-03-18 23:59:58 +0000
commitdeb4cee0617c84b572236743562890108643b82b (patch)
tree25b8733fe4144391cb02870a2cce1dfe01de0e9f
parentb83fec4d4fcb3086f2886e3424ea2db232aecdfd (diff)
Fix cherrypy import failure due to more-itertools
more-itertools version 6.0.0 is incompatible with python-2.7 importing cherrypy failes due to this. Changed startAnsibleServ.sh to explicitly install 'more-itertools' version 5.0.0 Also added 'apt-get update' before installing software-properties-common package which failed earlier to install. Container starts without problem after these changes Change-Id: I030ad54bb004056846f15eebf6ae0e8b5c4ae004 Issue-ID: CCSDK-1166 Signed-off-by: Divyang Patel <divyang.patel@team.telstra.com>
-rw-r--r--ansible-server/src/main/scripts/startAnsibleServer.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/ansible-server/src/main/scripts/startAnsibleServer.sh b/ansible-server/src/main/scripts/startAnsibleServer.sh
index dd6f2a36..9fe0b79e 100644
--- a/ansible-server/src/main/scripts/startAnsibleServer.sh
+++ b/ansible-server/src/main/scripts/startAnsibleServer.sh
@@ -3,10 +3,12 @@ exec &> >(tee -a "/var/log/ansible-server.log")
if [ ! -f /tmp/.ansible-server-installed ]
then
+ pip install 'more-itertools==5.0.0'
pip install PyMySQL
pip install 'cherrypy<18.0.0'
pip install requests
+ apt-get update
apt-get -y install software-properties-common
apt-add-repository -y ppa:ansible/ansible
apt-get -y install ansible