Merge "Rename update_puppet to update-system-config"

playbooks/update-system-config.yaml

@@ -0,0 +1,21 @@
+---
+- hosts: "localhost:!disabled"
+  connection: local
+  gather_facts: false
+  tasks:
+
+    - name: Make sure system-config repo is up to date
+      git:
+        repo: https://git.openstack.org/openstack-infra/system-config
+        dest: /opt/system-config/production
+        force: yes
+
+    - name: Clone puppet modules to /etc/puppet/modules
+      command: ./install_modules.sh
+      args:
+        chdir: /opt/system-config/production
+
+    - name: Install ansible roles to /etc/ansible/roles
+      command: ansible-galaxy install --force -r roles.yaml
+      args:
+        chdir: /opt/system-config/production

playbooks/update_puppet.yaml

@@ -1,15 +0,0 @@
----
-- hosts: "localhost:!disabled"
-  connection: local
-  gather_facts: false
-  tasks:
-  - git:
-      repo: https://git.openstack.org/openstack-infra/system-config
-      dest: /opt/system-config/production
-      force: yes
-  - shell: ./install_modules.sh
-    args:
-      chdir: /opt/system-config/production
-  - shell: ansible-galaxy install --force -r roles.yaml
-    args:
-      chdir: /opt/system-config/production

run_all.sh

@@ -31,7 +31,7 @@ set +e
 # stuck if they are oomkilled
 
 # First, sync the puppet repos with all the machines
-timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/update_puppet.yaml
+timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/update-system-config.yaml
 # Update the puppet version
 timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/update_puppet_version.yaml
 # Run the git/gerrit/zuul sequence, since it's important that they all work together