From 6db6ba3724028d3fc9827de52eac82dd640191ef Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 20 Oct 2014 15:23:14 -0500
Subject: [PATCH] Run puppet even if git servers fail

The current set of runs make the fleet depend on all git changes
working. The only thing we actually care about is that gerrit doesn't
get updated if git fails.

Change-Id: Id488e14c7dbaddfbffece7b1d8ef65f06b3688d8
---
 .../files/ansible/remote_puppet_else.yaml     |  5 +++++
 ...ote_puppet.yaml => remote_puppet_git.yaml} |  4 ----
 .../manifests/puppetmaster.pp                 | 20 ++++++++++++++++---
 run_all.sh                                    |  7 +++++--
 4 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 modules/openstack_project/files/ansible/remote_puppet_else.yaml
 rename modules/openstack_project/files/ansible/{remote_puppet.yaml => remote_puppet_git.yaml} (65%)

diff --git a/modules/openstack_project/files/ansible/remote_puppet_else.yaml b/modules/openstack_project/files/ansible/remote_puppet_else.yaml
new file mode 100644
index 0000000000..17318f1505
--- /dev/null
+++ b/modules/openstack_project/files/ansible/remote_puppet_else.yaml
@@ -0,0 +1,5 @@
+---
+- hosts: "!review.openstack.org:!git0*:!afs*"
+  gather_facts: false
+  roles:
+    - { role: puppet, puppetmaster: puppetmaster.openstack.org }
diff --git a/modules/openstack_project/files/ansible/remote_puppet.yaml b/modules/openstack_project/files/ansible/remote_puppet_git.yaml
similarity index 65%
rename from modules/openstack_project/files/ansible/remote_puppet.yaml
rename to modules/openstack_project/files/ansible/remote_puppet_git.yaml
index 1729eef303..6e843063af 100644
--- a/modules/openstack_project/files/ansible/remote_puppet.yaml
+++ b/modules/openstack_project/files/ansible/remote_puppet_git.yaml
@@ -8,7 +8,3 @@
   gather_facts: false
   roles:
     - { role: puppet, puppetmaster: puppetmaster.openstack.org }
-- hosts: "!review.openstack.org:!git0*:!afs*"
-  gather_facts: false
-  roles:
-    - { role: puppet, puppetmaster: puppetmaster.openstack.org }
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 41876d1dfa..19f50d7dbe 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -18,7 +18,9 @@ class openstack_project::puppetmaster (
     ca_server                 => $ca_server,
   }
 
-  $ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet.yaml'
+  $ansible_remote_puppet_else_source = 'puppet:///modules/openstack_project/ansible/remote_puppet_else.yaml'
+  $ansible_remote_puppet_afs_source = 'puppet:///modules/openstack_project/ansible/remote_puppet_afs.yaml'
+  $ansible_remote_puppet_git_source = 'puppet:///modules/openstack_project/ansible/remote_puppet_git.yaml'
 
   file {'/etc/puppet/environments':
     ensure => directory,
@@ -164,9 +166,21 @@ class openstack_project::puppetmaster (
 
 # Playbooks
 #
-  file { '/etc/ansible/remote_puppet.yaml':
+  file { '/etc/ansible/remote_puppet_else.yaml':
     ensure  => present,
-    source  => $ansible_remote_puppet_source,
+    source  => $ansible_remote_puppet_else_source,
+    require => Class[ansible],
+  }
+
+  file { '/etc/ansible/remote_puppet_afs.yaml':
+    ensure  => present,
+    source  => $ansible_remote_puppet_afs_source,
+    require => Class[ansible],
+  }
+
+  file { '/etc/ansible/remote_puppet_git.yaml':
+    ensure  => present,
+    source  => $ansible_remote_puppet_git_source,
     require => Class[ansible],
   }
 
diff --git a/run_all.sh b/run_all.sh
index e1ab439af4..4982b59e2c 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -23,8 +23,11 @@ git fetch -a && git reset -q --hard @{u}
 # some times
 touch manifests/site.pp
 
-# Run this as an external script so that the above pull will get new changes
-ansible-playbook /etc/ansible/remote_puppet.yaml >> /var/log/puppet_run_all.log 2>&1
+# First run the git/gerrit sequence, since it's important that they all work
+# together
+ansible-playbook /etc/ansible/remote_puppet_git.yaml >> /var/log/puppet_run_all.log 2>&1
 # Run AFS changes separately so we can make sure to only do one at a time
 # (turns out quorum is nice to have)
 ansible-playbook -f 1 /etc/ansible/remote_puppet_afs.yaml >> /var/log/puppet_run_all.log 2>&1
+# Run everything else. We do not care if the other things worked
+ansible-playbook /etc/ansible/remote_puppet_else.yaml >> /var/log/puppet_run_all.log 2>&1