From: Timoney, Dan (dt5972) <dt5972@att.com>
Date: Thu, 26 Apr 2018 18:02:08 +0000 (-0400)
Subject: Move add-apt-repository to startup
X-Git-Tag: v1.3.1~3^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ab93e4f6de3d0cc8abb707f98fc11b376a70e6fe;p=sdnc%2Foam.git

Move add-apt-repository to startup

add-apt-repository is failing in Jenkins, so move it to ansible server
startup script instead.

Change-Id: Iae058003678748c9a4bed9b5e279ebcce4c4695a
Issue-ID: SDNC-288
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

Former-commit-id: 352342232f7578dc31597291947457f800e6619e
---

diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile
index dfbb060c..87ae9e79 100644
--- a/installation/ansible-server/src/main/docker/Dockerfile
+++ b/installation/ansible-server/src/main/docker/Dockerfile
@@ -16,10 +16,7 @@ RUN apt-get -y install vim
 RUN apt-get -y install python2.7
 RUN apt-get -y install python-pip
 
-##Ansible:
-RUN apt-get -y install software-properties-common
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get -y install ansible
+
 
 # copy files needed
 COPY opt /opt/
diff --git a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh
index 67af9623..643bbab2 100644
--- a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh
+++ b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh
@@ -5,6 +5,10 @@ then
 	pip install PyMySQL
 	pip install cherrypy
 	pip install requests
+
+    apt-get -y install software-properties-common
+    apt-add-repository -y ppa:ansible/ansible
+    apt-get -y install ansible
 	date > /tmp/.ansible-server-installed 2>&1
 fi