commit d00d7ff28c756f3d588c1876e6973ed97f0c7b53
author Jessica Wagantall <jwagantall@linuxfoundation.org> Tue May 07 17:46:28 2019 +0000
committer Gerrit Code Review <gerrit@onap.org> Tue May 07 17:46:28 2019 +0000
tree 7898ea851824307d7d63cf9691b63142968337a9
parent 61aa5545ab16b76ae36d23c18c3d74d1ef8a9189
parent c2bf19b77cbc20302f20073e247f4c5ad1b0ba65

Merge "Update local-docker.yaml to support Centos"

packer/provision/local-docker.yaml

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index c660e18..f3af621 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -58,11 +58,11 @@
         name: libxml2-utils
         state: present
       become: true
-      when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install python-tox
-      apt:
-        name: python-tox
+      pip:
+        name: tox
         state: present
       become: true
 
@@ -70,12 +70,14 @@
         repo: ppa:jonathonf/python-3.6
         state: present
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Update and upgrade apt packages
       apt:
         upgrade: yes
         update_cache: yes
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install Python 3.6 and packages
       apt:
@@ -86,6 +88,7 @@
           - libmysqlclient-dev
           - gcc
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install base packages
       apt:
@@ -101,6 +104,7 @@
           - libssl-dev
           - libffi-dev
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install autorelease support packages
       apt:
@@ -111,29 +115,31 @@
           - maven
           - python-ncclient
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Add Google Chrome key
       apt_key:
         url: https://dl-ssl.google.com/linux/linux_signing_key.pub
         state: present
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Add Google Chrome repo
       copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Update apt cache
       apt: update_cache=yes
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Install Google Chrome
       apt:
         name: google-chrome-stable
         state: present
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install Erlang dependency packages
       apt:
@@ -142,26 +148,26 @@
           - libsctp1
           - libwxbase3.0-0v5
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install Erlang
       apt:
         deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
       install_recommends: yes
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Clone rebar3
       git:
         repo: 'https://github.com/erlang/rebar3.git'
         dest: /tmp/rebar3
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Bootstrap rebar3
       command: ./bootstrap
       args:
         chdir: /tmp/rebar3
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Install rebar3 to bin
       copy:
@@ -170,13 +176,13 @@
         mode: 0755
         remote_src: true
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Remove unused rebar3 source
       file:
         path: /tmp/rebar3
         state: absent
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Download geckodriver
       unarchive:
@@ -185,7 +191,7 @@
         mode: 0755
         remote_src: yes
       become: true
-      when: "'x86_64' in ansible_architecture"
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Download Firefox version 55.0.3
       unarchive:
@@ -193,13 +199,13 @@
         dest: /opt
         mode: 0755
         remote_src: yes
-      when: "'x86_64' in ansible_architecture"
       become: true
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
     - name: Create symbolic link to firefox bin
       file:
         src: "/opt/firefox/firefox"
         dest: "/usr/bin/firefox"
         state: link
-      when: "'x86_64' in ansible_architecture"
       become: true
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'