openstack
/
fuel-library
Code Issues Proposed changes

order fix for overrides

This commit is contained in:
Andrey Korolyov 2013-10-02 16:01:38 +04:00
parent 9182b7d2eb
commit 7e240e59e4
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/cluster/manifests/haproxy.pp
View File

@ -91,6 +91,7 @@ class cluster::haproxy (
ensure => "present",
content => "manual",
mode => 644,
before => Package['haproxy'],
}
}
}

7
deployment/puppet/corosync/manifests/init.pp
View File

@ -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'],
}
}
}

1
deployment/puppet/quantum/manifests/agents/dhcp.pp
View File

@ -26,6 +26,7 @@ class quantum::agents::dhcp (
ensure => "present",
content => "manual",
mode => 644,
before => Package['quantum-dhcp-agent'],
}
}
}

1
deployment/puppet/quantum/manifests/agents/l3.pp
View File

@ -41,6 +41,7 @@ class quantum::agents::l3 (
ensure => "present",
content => "manual",
mode => 644,
before => Package['quantum-l3'],
}
}
}

1
deployment/puppet/quantum/manifests/agents/ovs.pp
View File

@ -36,6 +36,7 @@ class quantum::agents::ovs (
ensure => "present",
content => "manual",
mode => 644,
before => Package['quantum-plugin-ovs-agent'],
}
}
}

1
deployment/puppet/quantum/manifests/server.pp
View File

@ -25,6 +25,7 @@ class quantum::server (
ensure => "present",
content => "manual",
mode => 644,
before => Package['quantum-server'],
}
}
}