stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Clone Pacemaker RA from upstream

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-12-16 12:08:57 +01:00
parent fd7088dc16
commit 1aee777f24
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
params.pp
View File

@@ -35,7 +35,7 @@ class os_params {
$site_domain = 'enovance.com' $site_domain = 'enovance.com'
$storage = True $storage = True
$verbose = False $verbose = False
$spof_nodes_are_separate = False $spof_nodes_are_separated = False
# Root hashed password # Root hashed password
# ToDo(EmilienM): Disable root user in all nodes and use sudo # ToDo(EmilienM): Disable root user in all nodes and use sudo

24
roles/spof/spof_node.pp
View File

@@ -18,9 +18,16 @@
class os_spof_node( class os_spof_node(
$debug = $os_params::debug, $debug = $os_params::debug,
$spof_nodes_are_separate = $os_params::spof_nodes_are_separate, $spof_nodes_are_separated = $os_params::spof_nodes_are_separate,
) { ) {
vcsrepo { '/usr/lib/ocf/resource.d/openstack/':
ensure => latest,
provider => git,
source => 'github.com:madkiss/openstack-resource-agents.git',
revision => 'master',
}
# Corosync & Pacemaker # Corosync & Pacemaker
class { 'corosync': class { 'corosync':
enable_secauth => false, enable_secauth => false,
@@ -42,9 +49,16 @@ class os_spof_node(
} }
# Resources managed by Corosync as Active / Passive # Resources managed by Corosync as Active / Passive
vcsrepo { '/usr/lib/ocf/resource.d/openstack/':
ensure => latest,
provider => git,
source => 'github.com:madkiss/openstack-resource-agents.git',
revision => 'master',
}
Package['corosync'] -> Package['corosync'] ->
file { '/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central': file { '/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central':
source => '/scripts/ceilometer-agent-central_resource-agent', source => '/usr/lib/ocf/resource.d/openstack/ceilometer-agent-central',
mode => '0755', mode => '0755',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
@@ -61,7 +75,7 @@ class os_spof_node(
Package['corosync'] -> Package['corosync'] ->
file { '/usr/lib/ocf/resource.d/heartbeat/neutron-metadata-agent': file { '/usr/lib/ocf/resource.d/heartbeat/neutron-metadata-agent':
source => '/scripts/neutron-metadata-agent_resource-agent', source => '/usr/lib/ocf/resource.d/openstack/neutron-metadata-agent',
mode => '0755', mode => '0755',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
@@ -78,7 +92,7 @@ class os_spof_node(
Package['corosync'] -> Package['corosync'] ->
file { '/usr/lib/ocf/resource.d/heartbeat/heat-engine': file { '/usr/lib/ocf/resource.d/heartbeat/heat-engine':
source => '/scripts/heat-engine_resource-agent', source => '/usr/lib/ocf/resource.d/openstack/heat-engine',
mode => '0755', mode => '0755',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
@@ -95,7 +109,7 @@ class os_spof_node(
# If SPOF nodes are separated from controller nodes, # If SPOF nodes are separated from controller nodes,
# we should import common OpenStack classes: # we should import common OpenStack classes:
if $spof_nodes_are_separate { if $spof_nodes_are_separated {
class { 'os_network_common': } class { 'os_network_common': }
class { 'os_orchestration_common': } class { 'os_orchestration_common': }
class { 'os_telemetry_common': } class { 'os_telemetry_common': }