Merge pull request #279 from imcsk8/pacemaker-cve-bump

Pacemaker cve bump
redhat-openstack · Apr 2, 2015 · b1d454a · b1d454a
2 parents c85f402 + fd2de22
commit b1d454a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -95,8 +95,8 @@ mod 'openstack',
   :git => 'https://github.com/stackforge/puppet-openstack.git'
 
 mod 'pacemaker',
-  :commit => '0ed9ee8a29c0f27e86727d415b39d2715332df7d',
-  :git => 'https://github.com/radez/puppet-pacemaker.git'
+  :commit => '5d91343c80f65b64be604f4a61558ff408c0f863',
+  :git => 'https://github.com/redhat-openstack/puppet-pacemaker.git'
 
 mod 'puppet',
   :commit => 'bd467cae15eba9ca44274034d2593b0eaf30518d',

diff --git a/pacemaker/manifests/corosync.pp b/pacemaker/manifests/corosync.pp
@@ -53,13 +53,13 @@
     }
     ->
     exec {"Set password for hacluster user on $cluster_name":
-      command => "/bin/echo ${::pacemaker::params::hacluster_pwd} | /usr/bin/passwd --stdin hacluster",
+      command => "/bin/echo ${::pacemaker::hacluster_pwd} | /usr/bin/passwd --stdin hacluster",
       creates => "/etc/cluster/cluster.conf",
       require => Class["::pacemaker::install"],
     }
     ->
     exec {"auth-successful-across-all-nodes":
-      command => "/usr/sbin/pcs cluster auth $cluster_members -u hacluster -p ${::pacemaker::params::hacluster_pwd} --force",
+      command => "/usr/sbin/pcs cluster auth $cluster_members -u hacluster -p ${::pacemaker::hacluster_pwd} --force",
       timeout   => 3600,
       tries     => 360,
       try_sleep => 10,