From 7e240e59e4564478f76ae8505042e51264b6112f Mon Sep 17 00:00:00 2001
From: Andrey Korolyov <andrey@xdel.ru>
Date: Wed, 2 Oct 2013 16:01:38 +0400
Subject: [PATCH] order fix for overrides

---
 deployment/puppet/cluster/manifests/haproxy.pp     | 1 +
 deployment/puppet/corosync/manifests/init.pp       | 7 ++++---
 deployment/puppet/quantum/manifests/agents/dhcp.pp | 1 +
 deployment/puppet/quantum/manifests/agents/l3.pp   | 1 +
 deployment/puppet/quantum/manifests/agents/ovs.pp  | 1 +
 deployment/puppet/quantum/manifests/server.pp      | 1 +
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/deployment/puppet/cluster/manifests/haproxy.pp b/deployment/puppet/cluster/manifests/haproxy.pp
index 298fea1e28..3e1b374291 100644
--- a/deployment/puppet/cluster/manifests/haproxy.pp
+++ b/deployment/puppet/cluster/manifests/haproxy.pp
@@ -91,6 +91,7 @@ class cluster::haproxy (
       ensure  => "present",
       content => "manual",
       mode    => 644,
+      before  => Package['haproxy'],
       }
     }
   }
diff --git a/deployment/puppet/corosync/manifests/init.pp b/deployment/puppet/corosync/manifests/init.pp
index ff6f38543d..5c945d12a1 100644
--- a/deployment/puppet/corosync/manifests/init.pp
+++ b/deployment/puppet/corosync/manifests/init.pp
@@ -114,13 +114,13 @@ class corosync (
     }
   }
   if $::operatingsystem == 'Ubuntu' {
-    package { ['corosync', 'pacemaker']: ensure => present } ->
-       file { "/etc/init/corosync.override":
+      file { "/etc/init/corosync.override":
          replace => "no",
          ensure  => "present",
          content => "manual",
          mode    => 644,
-      }
+      } ->
+     package { ['corosync', 'pacemaker']: ensure => present }
    } else {
      package { ['corosync', 'pacemaker']: ensure => present }
    }
@@ -181,6 +181,7 @@ class corosync (
       exec { 'rm_corosync_override':
         command => '/bin/rm -f /etc/init/corosync.override',
         path    => ['/bin', '/usr/bin'],
+        require => File['/etc/corosync/corosync.conf'],
       }
     } 
   }
diff --git a/deployment/puppet/quantum/manifests/agents/dhcp.pp b/deployment/puppet/quantum/manifests/agents/dhcp.pp
index 1b688545c7..3c0b8bd249 100644
--- a/deployment/puppet/quantum/manifests/agents/dhcp.pp
+++ b/deployment/puppet/quantum/manifests/agents/dhcp.pp
@@ -26,6 +26,7 @@ class quantum::agents::dhcp (
          ensure  => "present",
          content => "manual",
          mode    => 644,
+         before  => Package['quantum-dhcp-agent'],
        }
     }
   }
diff --git a/deployment/puppet/quantum/manifests/agents/l3.pp b/deployment/puppet/quantum/manifests/agents/l3.pp
index 4dae1d1f70..603766f7a0 100644
--- a/deployment/puppet/quantum/manifests/agents/l3.pp
+++ b/deployment/puppet/quantum/manifests/agents/l3.pp
@@ -41,6 +41,7 @@ class quantum::agents::l3 (
          ensure  => "present",
          content => "manual",
          mode    => 644,
+         before  => Package['quantum-l3'],
        }
      }
   }
diff --git a/deployment/puppet/quantum/manifests/agents/ovs.pp b/deployment/puppet/quantum/manifests/agents/ovs.pp
index 64963ff7e6..54d6b6c961 100644
--- a/deployment/puppet/quantum/manifests/agents/ovs.pp
+++ b/deployment/puppet/quantum/manifests/agents/ovs.pp
@@ -36,6 +36,7 @@ class quantum::agents::ovs (
          ensure  => "present",
          content => "manual",
          mode    => 644,
+         before  => Package['quantum-plugin-ovs-agent'],
       }
     }
   }
diff --git a/deployment/puppet/quantum/manifests/server.pp b/deployment/puppet/quantum/manifests/server.pp
index 0f0ce7d8ec..bdcf182de0 100644
--- a/deployment/puppet/quantum/manifests/server.pp
+++ b/deployment/puppet/quantum/manifests/server.pp
@@ -25,6 +25,7 @@ class quantum::server (
          ensure  => "present",
          content => "manual",
          mode    => 644,
+         before  => Package['quantum-server'],
        }
     }
   }