Some tasks were wrongly placed in prepare.yml.

robertdebock · Mar 17, 2019 · 3a26a25 · 3a26a25
1 parent 8192da0
commit 3a26a25
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -16,18 +16,6 @@ This example is taken from `molecule/default/playbook.yml`:
   become: yes
   gather_facts: yes
 
-  roles:
-    - robertdebock.httpd
-```
-
-The machine you are running this on, may need to be prepared. Tests have been done on machines prepared by this playbook:
-```yaml
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
   vars:
     httpd_locations:
       - name: mylocation1
@@ -47,6 +35,18 @@ The machine you are running this on, may need to be prepared. Tests have been do
         backend_url: http://www.example.com/
         remote: http://localhost:3128/
 
+  roles:
+    - robertdebock.httpd
+```
+
+The machine you are running this on, may need to be prepared. Tests have been done on machines prepared by this playbook:
+```yaml
+---
+- name: Prepare
+  hosts: all
+  gather_facts: no
+  become: yes
+
   roles:
     - robertdebock.bootstrap
     - robertdebock.epel

diff --git a/molecule/resources/playbook.yml b/molecule/resources/playbook.yml
@@ -4,5 +4,24 @@
   become: yes
   gather_facts: yes
 
+  vars:
+    httpd_locations:
+      - name: mylocation1
+        location: /mylocation1
+        backend_url: http://localhost:8080/myapplication
+    httpd_vhosts:
+      - name: myvhost1
+        servername: www1.example.com
+        documentroot: /var/www/html/www1.example.com
+      - name: myvhost2
+        servername: www2.example.com
+        documentroot: /var/www/html/www2.example.com
+        backend_url: http://www.example.com/
+      - name: myvhost3
+        servername: www3.example.com
+        documentroot: /var/www/html/www3.example.com
+        backend_url: http://www.example.com/
+        remote: http://localhost:3128/
+
   roles:
     - ansible-role-httpd
diff --git a/molecule/resources/prepare.yml b/molecule/resources/prepare.yml
@@ -4,25 +4,6 @@
   gather_facts: no
   become: yes
 
-  vars:
-    httpd_locations:
-      - name: mylocation1
-        location: /mylocation1
-        backend_url: http://localhost:8080/myapplication
-    httpd_vhosts:
-      - name: myvhost1
-        servername: www1.example.com
-        documentroot: /var/www/html/www1.example.com
-      - name: myvhost2
-        servername: www2.example.com
-        documentroot: /var/www/html/www2.example.com
-        backend_url: http://www.example.com/
-      - name: myvhost3
-        servername: www3.example.com
-        documentroot: /var/www/html/www3.example.com
-        backend_url: http://www.example.com/
-        remote: http://localhost:3128/
-
   roles:
     - robertdebock.bootstrap
     - robertdebock.epel