diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-04-26 18:55:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-26 18:55:03 +0000 |
| commit | b954f3e2a2a78e0119ad1ad8976c12e444a62252 (patch) | |
| tree | 6172d87ca71a751210d02ac19e0581328fb3d826 | |
| parent | 16451bbee9de0eb93a9f4033553c09fcd9070f7c (diff) | |
| parent | ab93e4f6de3d0cc8abb707f98fc11b376a70e6fe (diff) | |
Merge "Move add-apt-repository to startup"
Former-commit-id: 11381d1feec3dacc6232f33c7bdc6e1d841e34ac
| -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 |