6 files changed, 79 insertions, 53 deletions
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 6a821f3..6e8fbb2 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -57,6 +57,7 @@ class tripleo::profile::base::cinder (
       rabbit_hosts => $rabbit_endpoints,
     }
     include ::cinder::config
+    include ::cinder::glance
   }
 
   if $step >= 5 {
diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index 5ea2058..450a8e6 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -94,7 +94,6 @@ class tripleo::profile::base::cinder::api (
       ssl_key  => $tls_keyfile,
     }
     include ::cinder::ceilometer
-    include ::cinder::glance
   }
 
 }
diff --git a/manifests/profile/base/glance/registry.pp b/manifests/profile/base/glance/registry.pp
deleted file mode 100644
index cd40aeb..0000000
--- a/manifests/profile/base/glance/registry.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# == Class: tripleo::profile::base::glance::registry
-#
-# Glance Registry profile for tripleo
-#
-# === Parameters
-#
-# [*bootstrap_node*]
-#   DEPRECATED
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
-# [*glance_backend*]
-#   (Optional) Glance backend(s) to use.
-#   Defaults to downcase(hiera('glance_backend', 'swift'))
-#
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-class tripleo::profile::base::glance::registry (
-  $bootstrap_node = undef,
-  $glance_backend = downcase(hiera('glance_backend', 'swift')),
-  $step           = hiera('step'),
-) {
-
-  if $step >= 4 {
-    # TODO: notifications, scrubber, etc.
-    include ::glance
-    include ::glance::config
-    include ::glance::registry
-    include ::glance::notify::rabbitmq
-    include join(['::glance::backend::', $glance_backend])
-  }
-
-}
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index dae627c..fe1e6a6 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -110,6 +110,7 @@ class tripleo::profile::base::nova (
   }
 
   if $step >= 4 {
+    include ::nova::placement
     if $manage_migration {
       class { '::nova::migration::libvirt':
         configure_libvirt => $libvirt_enabled,
diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp
index 7edd4e8..aa8c3c7 100644
--- a/manifests/profile/base/nova/placement.pp
+++ b/manifests/profile/base/nova/placement.pp
@@ -86,8 +86,6 @@ class tripleo::profile::base::nova::placement (
   }
 
   if $step >= 4 {
-    include ::nova::placement
-
     class { '::nova::wsgi::apache_placement':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
diff --git a/manifests/profile/pacemaker/ceph/rbdmirror.pp b/manifests/profile/pacemaker/ceph/rbdmirror.pp
new file mode 100644
index 0000000..8e2ff77
--- /dev/null
+++ b/manifests/profile/pacemaker/ceph/rbdmirror.pp
@@ -0,0 +1,77 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::pacemaker::ceph::rbdmirror
+#
+# Ceph RBD mirror Pacemaker profile for tripleo
+#
+# === Parameters
+#
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('ceph_rbdmirror_bootstrap_short_node_name')
+#
+# [*client_name*]
+#   (Optional) Name assigned to the RBD mirror client
+#   Defaults to 'rbd-mirror'
+#
+# [*stack_action*]
+#   (Optional) Action executed on the stack. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('stack_action')
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::pacemaker::ceph::rbdmirror (
+  $bootstrap_node = hiera('ceph_rbdmirror_bootstrap_short_node_name'),
+  $client_name    = 'openstack',
+  $stack_action   = hiera('stack_action'),
+  $step           = hiera('step'),
+) {
+  Service <| tag == 'ceph-rbd-mirror' |> {
+    hasrestart => true,
+    restart    => '/bin/true',
+    start      => '/bin/true',
+    stop       => '/bin/true',
+  }
+
+  if $::hostname == downcase($bootstrap_node) {
+    $pacemaker_master = true
+  } else {
+    $pacemaker_master = false
+  }
+
+  include ::tripleo::profile::base::ceph
+
+  if $step >= 3 {
+    ceph::mirror { $client_name:
+      rbd_mirror_enable => false,
+      rbd_mirror_ensure => 'stopped',
+    } ->
+    pacemaker::resource::service { "ceph-rbd-mirror_${client_name}":
+      # NOTE(gfidente): systemd uses the @ sign but it is an invalid
+      # character in a pcmk resource name, so we need to use it only
+      # for the name of the service
+      service_name => "ceph-rbd-mirror@${client_name}"
+    }
+  }
+
+  if $step >= 3 and $pacemaker_master and $stack_action == 'UPDATE' {
+    Ceph_config<||> ~> Tripleo::Pacemaker::Resource_restart_flag["ceph-rbd-mirror@${client_name}"]
+    tripleo::pacemaker::resource_restart_flag { "ceph-rbd-mirror@${client_name}": }
+  }
+}