Merge "install-ansible: move install_modules.sh to puppet-setup-ansible"

playbooks/roles/install-ansible/tasks/main.yaml

@@ -119,21 +119,6 @@
     owner: root
     group: root
 
-# Yeah. This is install-ansible. But we need to do this and doing it when
-# we install the ansible stuff seems like the right time workflow-wise.
-- name: Ensure puppet directory
-  file:
-    state: directory
-    path: /etc/puppet
-
-- name: Install puppet module management scripts
-  copy:
-    src: '{{ item }}'
-    dest: '/etc/puppet/{{ item }}'
-  loop:
-    - install_modules.sh
-    - modules.env
-
 - name: Copy yamlgroup inventory in place
   copy:
     src: inventory_plugins/yamlgroup.py

playbooks/roles/puppet-setup-ansible/tasks/main.yaml

@@ -4,6 +4,19 @@
     ansible_roles:
       - puppet
 
+- name: Ensure puppet directory
+  file:
+    state: directory
+    path: /etc/puppet
+
+- name: Install puppet module management scripts
+  copy:
+    src: '{{ item }}'
+    dest: '/etc/puppet/{{ item }}'
+  loop:
+    - install_modules.sh
+    - modules.env
+
 - name: Run puppet module install on bridge
   command:
     cmd: bash install_modules.sh