From dc7d65be059966c6cdf19557921f71bb36660227 Mon Sep 17 00:00:00 2001
From: Szymon Cader <szymon.SC.cader@gmail.com>
Date: Sat, 4 Jul 2020 15:54:24 +0200
Subject: [PATCH] Add role dev requirements

---
 .travis.yml                   |  2 +-
 molecule/default/converge.yml | 34 -----------------------------
 molecule/default/molecule.yml |  1 -
 molecule/default/prepare.yml  | 41 +++++++++++++++++++++++++++++++++++
 requirements.txt              |  8 +++++++
 5 files changed, 50 insertions(+), 36 deletions(-)
 create mode 100644 molecule/default/prepare.yml
 create mode 100644 requirements.txt

diff --git a/.travis.yml b/.travis.yml
index 3bcee4d..7aa9dbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ addons:
 install:
   - mv "$PWD" "${PWD%/*}/$ROLE_NAME"
   # Install ansible
-  - pip install ansible molecule docker testinfra pytest pytest-xdist
+  - pip install -r requirements.txt
 
   # Check ansible version
   - ansible --version
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 46a8160..8242aa6 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -24,39 +24,5 @@
         media_root: /var/www/media/
         certificate: /etc/nginx/ssl/fullchain.pem  # selfsigned
         private_key: /etc/nginx/ssl/privkey.pem  # selfsigned
-
-  pre_tasks:
-    - name: Update apt cache
-      apt: update_cache=yes cache_valid_time=600
-      become: yes
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-    - name: "Create directories"
-      file:
-        path: /var/www/{{ item }}
-        state: directory
-      loop:
-        - static
-        - media
-    - name: "Create test file"
-      copy:
-        dest: /var/www/{{ item.directory }}/{{ item.file }}
-        content: "{{ item.directory }}"
-      loop:
-        - directory: static
-          file: static.html
-        - directory: static
-          file: cache.js
-        - directory: static
-          file: cache.css
-        - directory: media
-          file: media.html
-    - debug: var=ansible_python
-      tags: xd
-    - name: Run simple python server
-      shell:
-        cmd: "nohup {{ ansible_python.executable }} -m {{ 'http.server' if ansible_python.version.major == 3 else 'SimpleHTTPServer'}} &"
-        chdir: /tmp
-      tags: xd
   roles:
     - role: nginx
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index faf908c..0af7daf 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -26,4 +26,3 @@ verifier:
   name: testinfra
   options:
     capture: no
-    # n: 2
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
new file mode 100644
index 0000000..3d2e111
--- /dev/null
+++ b/molecule/default/prepare.yml
@@ -0,0 +1,41 @@
+---
+- name: Converge
+  hosts: all
+  remote_user: ansible
+  become: yes
+  tasks:
+    - name: Update apt cache
+      apt:
+        update_cache: yes
+        cache_valid_time: 600
+      become: yes
+      when: ansible_os_family == 'Debian'
+      changed_when: false
+
+    - name: "Create directories"
+      file:
+        path: /var/www/{{ item }}
+        state: directory
+      loop:
+        - static
+        - media
+
+    - name: "Create test file"
+      copy:
+        dest: /var/www/{{ item.directory }}/{{ item.file }}
+        content: "{{ item.directory }}"
+      loop:
+        - directory: static
+          file: static.html
+        - directory: static
+          file: cache.js
+        - directory: static
+          file: cache.css
+        - directory: media
+          file: media.html
+    - debug:
+        var: ansible_python
+    - name: Run simple python server
+      shell:
+        cmd: "nohup {{ ansible_python.executable }} -m {{ 'http.server' if ansible_python.version.major == 3 else 'SimpleHTTPServer'}} &"
+        chdir: /tmp
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..32f45aa
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,8 @@
+ansible==2.9.10
+ansible-lint==4.2.0
+docker==4.2.1
+molecule==3.0.4
+pytest==5.4.3
+requests==2.24.0
+testinfra==5.2.1
+yamllint==1.23.0