1 files changed, 69 insertions, 11 deletions

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 645ad6ed..f8ef7212 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -331,7 +331,7 @@ if hiera('step') >= 2 {
     }
 
     pacemaker::resource::service { $::memcached::params::service_name :
-      clone_params => true,
+      clone_params => "interleave=true",
       require      => Class['::memcached'],
     }
 
@@ -525,6 +525,16 @@ if hiera('step') >= 3 {
   $http_store = ['glance.store.http.Store']
   $glance_store = concat($http_store, $backend_store)
 
+  if $glance_backend == 'file' and hiera('glance_file_pcmk_manage', false) {
+    pacemaker::resource::filesystem { "glance-fs":
+      device       => hiera('glance_file_pcmk_device'),
+      directory    => hiera('glance_file_pcmk_directory'),
+      fstype       => hiera('glance_file_pcmk_fstype'),
+      fsoptions    => hiera('glance_file_pcmk_options', ''),
+      clone_params => '',
+    }
+  }
+
   # TODO: notifications, scrubber, etc.
   include ::glance
   class { 'glance::api':
@@ -804,12 +814,11 @@ if hiera('step') >= 3 {
   }
 
   # Ceilometer
-  $ceilometer_backend = downcase(hiera('ceilometer_backend'))
-  case $ceilometer_backend {
-    /mysql/ : {
+  case downcase(hiera('ceilometer_backend')) {
+    /mysql/: {
       $ceilometer_database_connection = hiera('ceilometer_mysql_conn_string')
     }
-    default : {
+    default: {
       $mongo_node_string = join($mongo_node_ips_with_port, ',')
       $ceilometer_database_connection = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}"
     }
@@ -909,7 +918,11 @@ if hiera('step') >= 4 {
 
     # Keystone
     pacemaker::resource::service { $::keystone::params::service_name :
-      clone_params => "interleave=true",
+      clone_params     => "interleave=true",
+      verify_on_create => true,
+      require          => [File['/etc/keystone/ssl/certs/ca.pem'],
+                           File['/etc/keystone/ssl/private/signing_key.pem'],
+                           File['/etc/keystone/ssl/certs/signing_cert.pem']],
     }
 
     pacemaker::constraint::base { 'haproxy-then-keystone-constraint':
@@ -1043,7 +1056,6 @@ if hiera('step') >= 4 {
     # https://bugzilla.redhat.com/show_bug.cgi?id=1233061
     exec { '/usr/bin/systemctl start neutron-server && /usr/bin/sleep 5' : } ->
     pacemaker::resource::service { $::neutron::params::server_service:
-      op_params => "start timeout=90",
       clone_params   => "interleave=true",
       require => Pacemaker::Resource::Service[$::keystone::params::service_name]
     }
@@ -1269,10 +1281,20 @@ if hiera('step') >= 4 {
     }
 
     # Ceilometer
-    pacemaker::resource::service { $::ceilometer::params::agent_central_service_name :
-      clone_params => 'interleave=true',
-      require      => [Pacemaker::Resource::Service[$::keystone::params::service_name],
-                       Pacemaker::Resource::Service[$::mongodb::params::service_name]],
+    case downcase(hiera('ceilometer_backend')) {
+      /mysql/: {
+        pacemaker::resource::service { $::ceilometer::params::agent_central_service_name :
+          clone_params => 'interleave=true',
+          require      => Pacemaker::Resource::Service[$::keystone::params::service_name],
+        }
+      }
+      default: {
+        pacemaker::resource::service { $::ceilometer::params::agent_central_service_name :
+          clone_params => 'interleave=true',
+          require      => [Pacemaker::Resource::Service[$::keystone::params::service_name],
+                           Pacemaker::Resource::Service[$::mongodb::params::service_name]],
+        }
+      }
     }
     pacemaker::resource::service { $::ceilometer::params::collector_service_name :
       clone_params => 'interleave=true',
@@ -1534,5 +1556,41 @@ if hiera('step') >= 4 {
 
 } #END STEP 4
 
+if hiera('step') >= 5 {
+
+  if $pacemaker_master {
+
+    class {'::keystone::roles::admin' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    } ->
+    class {'::keystone::endpoint' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    } ->
+    class { '::ceilometer::keystone::auth' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    } ->
+    class { '::cinder::keystone::auth' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    } ->
+    class { '::glance::keystone::auth' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    } ->
+    class { '::heat::keystone::auth' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    } ->
+    class { '::neutron::keystone::auth' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    } ->
+    class { '::nova::keystone::auth' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    } ->
+    class { '::swift::keystone::auth' :
+      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
+    }
+
+  }
+
+} #END STEP 5
+
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')])
 package_manifest{$package_manifest_name: ensure => present}