Merge pull request #65 from teacheraio/ubuntu

Move Studio to Ubuntu official image

machines.yml

@@ -1,30 +1,30 @@
 ---
 - name: DevSecOps-Box
-  box: bento/ubuntu-16.04
+  box: ubuntu/xenial64
   ram: 512
   ip: 10.0.1.10
   ansible: "provisioning/devsecops-box.yml"
 
 - name: jenkins
-  box: bento/ubuntu-16.04
+  box: ubuntu/xenial64
   ram: 1024
   ip: 10.0.1.11
   ansible: "provisioning/jenkins.yml"
 
 - name: gitlab
-  box: bento/ubuntu-16.04
+  box: ubuntu/xenial64
   ram: 2048
   ip: 10.0.1.15
   ansible: "provisioning/gitlab.yml"
 
 - name: gitlab-runner
-  box: bento/ubuntu-16.04
+  box: ubuntu/xenial64
   ram: 512
   ip: 10.0.1.16
   ansible: "provisioning/gitlab-runner.yml"
 
 - name: elk
-  box: bento/ubuntu-16.04
+  box: ubuntu/xenial64
   ram: 1024
   ip: 10.0.1.18
   ansible: "provisioning/elk.yml"
@@ -37,7 +37,7 @@
 
   # Includes registry docker, docker and docker compose installed. 
 - name: prod
-  box: bento/ubuntu-16.04
+  box: ubuntu/xenial64
   ram: 1024
   ip: 10.0.1.22
   ansible: "provisioning/prod.yml"

provisioning/devsecops-box.yml

@@ -1,13 +1,20 @@
 ---
 
 - name: Install Docker, Docker Compose, Ansible, Packer and Terraform
+  gather_facts: False
   hosts: all
-  become: true
-  become_user: root
-  remote_user: vagrant
-  vars:
-    ansible_user: 'vagrant'
+  become: yes
 
+  pre_tasks:
+  - name: install python 2
+    raw: test -e /usr/bin/python || (apt-get -y update && apt-get install -y python-minimal)
+  - name: Run setup again for gather facts
+    setup:
+  - name: Fix hash mismatch error
+    apt:
+       update_cache: yes
+
+  vars:
     # Inspec
     ruby_version: 'ruby-2.3.1'
     rvm1_rubies: ['{{ ruby_version }}']

provisioning/elk.yml

@@ -1,10 +1,19 @@
 ---
 
 - name: Install ELK stack
+  gather_facts: False
   hosts: all
   become: yes
-  become_user: root
-  remote_user: vagrant
+
+  pre_tasks:
+  - name: install python 2
+    raw: test -e /usr/bin/python || (apt-get -y update && apt-get install -y python-minimal)
+  - name: Run setup again for gather facts
+    setup:
+  - name: Fix hash mismatch error
+    apt:
+       update_cache: yes
+
   vars:
     - elasticsearch_network_host: localhost
     # host entries won't work in docker

provisioning/gitlab-runner.yml

@@ -1,10 +1,19 @@
 ---
 
 - name: Install gitlab runner
+  gather_facts: False
   hosts: all
-  become: true
-  become_user: root
-  remote_user: vagrant
+  become: yes
+
+  pre_tasks:
+  - name: install python 2
+    raw: test -e /usr/bin/python || (apt-get -y update && apt-get install -y python-minimal)
+  - name: Run setup again for gather facts
+    setup:
+  - name: Fix hash mismatch error
+    apt:
+       update_cache: yes
+
   vars:
     gitlab_runner_registration_token: 'CtNi9vq-4yFazTLntDU-'
     gitlab_runner_connect_enable: false

provisioning/gitlab.yml

@@ -1,10 +1,18 @@
 ---
 
 - name: Install gitlab server
+  gather_facts: False
   hosts: all
   become: yes
-  become_user: root
-  remote_user: vagrant
+
+  pre_tasks:
+  - name: install python 2
+    raw: test -e /usr/bin/python || (apt-get -y update && apt-get install -y python-minimal)
+  - name: Run setup again for gather facts
+    setup:
+  - name: Fix hash mismatch error
+    apt:
+       update_cache: yes
 
   vars:
     # host entries won't work in docker

provisioning/jenkins.yml

@@ -1,9 +1,18 @@
 ---
-- hosts: all
-  gather_facts: yes
+
+- name: Install Jenkins
+  gather_facts: False
+  hosts: all
   become: yes
-  become_user: root
-  remote_user: vagrant
+
+  pre_tasks:
+  - name: install python 2
+    raw: test -e /usr/bin/python || (apt-get -y update && apt-get install -y python-minimal)
+  - name: Run setup again for gather facts
+    setup:
+  - name: Fix hash mismatch error
+    apt:
+       update_cache: yes
 
   vars:
     oracle_java_version: 8

provisioning/molecule/devsecops/playbook.yml

@@ -3,8 +3,7 @@
 - name: Setup DevSecOps environment
   hosts: all
   become: true
-  become_user: root
-  remote_user: root
+
   vars:
     # Inspec
     ruby_version: 'ruby-2.3.1'

provisioning/molecule/elk/playbook.yml

@@ -3,8 +3,7 @@
 - name: Install ELK stack
   hosts: all
   become: yes
-  become_user: root
-  remote_user: root
+
   vars:
     - elasticsearch_network_host: localhost
 

provisioning/molecule/gitlab-runner/playbook.yml

@@ -3,8 +3,7 @@
 - name: Install gitlab runner
   hosts: all
   become: true
-  become_user: root
-  remote_user: root
+
   vars:
     gitlab_runner_registration_token: ''
     gitlab_runner_connect_enable: false

provisioning/molecule/gitlab/playbook.yml

@@ -3,8 +3,6 @@
 - name: Configure gitlab on ubuntu server
   hosts: all
   become: true
-  become_user: root
-  remote_user: root
 
   vars:
     gitlab_restart_handler_failed_when: false

provisioning/molecule/jenkins/playbook.yml

@@ -2,8 +2,6 @@
 - hosts: all
   gather_facts: yes
   become: yes
-  become_user: root
-  remote_user: root
 
   vars:
     oracle_java_version: 8

provisioning/molecule/prod/playbook.yml

@@ -3,9 +3,6 @@
 - name: Setup production environment
   hosts: all
   become: true
-  become_user: root
-  remote_user: root
-  vars:
 
   roles:
     - common

provisioning/prod.yml

@@ -1,10 +1,19 @@
 ---
 
 - name: Setup production environment
+  gather_facts: False
   hosts: all
-  become: true
-  become_user: root
-  remote_user: vagrant
+  become: yes
+
+  pre_tasks:
+  - name: install python 2
+    raw: test -e /usr/bin/python || (apt-get -y update && apt-get install -y python-minimal)
+  - name: Run setup again for gather facts
+    setup:
+  - name: Fix hash mismatch error
+    apt:
+       update_cache: yes
+
   vars:
 
     # host entries won't work in docker

provisioning/vuln-management.yml

@@ -1,10 +1,18 @@
 ---
 
 - name: Install Vulnerability Management
+  gather_facts: False
   hosts: all
   become: yes
-  become_user: root
-  remote_user: vagrant
+
+  pre_tasks:
+  - name: install python 2
+    raw: test -e /usr/bin/python || (apt-get -y update && apt-get install -y python-minimal)
+  - name: Run setup again for gather facts
+    setup:
+  - name: Fix hash mismatch error
+    apt:
+       update_cache: yes
 
   vars:
     # host entries won't work in docker