diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-26 14:02:08 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-26 14:02:08 -0400 |
| commit | ab93e4f6de3d0cc8abb707f98fc11b376a70e6fe (patch) | |
| tree | 9370b72ec92d74f646fb46e941212d5801c31b65 /installation | |
| parent | 1fea9e8e1f8e33607fe9bd1735b1b5cbf8100e27 (diff) | |
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
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/ansible-server/src/main/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | installation/ansible-server/src/main/scripts/startAnsibleServer.sh | 4 |
2 files changed, 5 insertions, 4 deletions
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 |