3 files changed, 37 insertions, 8 deletions
diff --git a/manifests/profile/base/ceph.pp b/manifests/profile/base/ceph.pp
index 29ca9ae..94166ac 100644
--- a/manifests/profile/base/ceph.pp
+++ b/manifests/profile/base/ceph.pp
@@ -35,6 +35,10 @@
 #   mon_host when ceph_ipv6 is true
 #   Defaults to undef
 #
+# [*enable_ceph_storage*]
+#   (Optional) enable_ceph_storage
+#   Deprecated: defaults to false
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -45,6 +49,7 @@ class tripleo::profile::base::ceph (
   $ceph_mon_initial_members = undef,
   $ceph_mon_host            = undef,
   $ceph_mon_host_v6         = undef,
+  $enable_ceph_storage      = false,
   $step                     = hiera('step'),
 ) {
 
@@ -67,4 +72,9 @@ class tripleo::profile::base::ceph (
 
     include ::ceph::conf
   }
+
+  # TODO: deprecated boolean
+  if $enable_ceph_storage {
+    include ::tripleo::profile::base::ceph::osd
+  }
 }
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index 66f0d7d..52a4c73 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -22,8 +22,23 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
+# [*manage_migration*]
+#   (Optional) Whether or not manage Nova Live migration
+#   Defaults to false
+#
+# [*libvirt_enabled*]
+#   (Optional) Whether or not Libvirt is enabled.
+#   Defaults to false
+#
+# [*nova_compute_enabled*]
+#   (Optional) Whether or not nova-compute is enabled.
+#   Defaults to false
+#
 class tripleo::profile::base::nova (
-  $step = hiera('step'),
+  $step                 = hiera('step'),
+  $manage_migration     = false,
+  $libvirt_enabled      = false,
+  $nova_compute_enabled = false,
 ) {
 
   if hiera('nova::use_ipv6', false) {
@@ -41,4 +56,14 @@ class tripleo::profile::base::nova (
     }
     include ::nova::config
   }
+
+  if $step >= 4 {
+    if $manage_migration {
+      class { '::nova::migration::libvirt':
+        configure_libvirt => $libvirt_enabled,
+        configure_nova    => $nova_compute_enabled,
+      }
+    }
+  }
+
 }
diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp
index 497d6f3..46a40db 100644
--- a/manifests/profile/pacemaker/keystone.pp
+++ b/manifests/profile/pacemaker/keystone.pp
@@ -46,15 +46,9 @@ class tripleo::profile::pacemaker::keystone (
 
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
-  } else {
-    $pacemaker_master = false
-  }
-
-  if $step >= 5 and $pacemaker_master {
     $manage_roles = true
-    Pacemaker::Resource::Service[$::apache::params::service_name] -> Class['::keystone::roles::admin']
-    Pacemaker::Resource::Service[$::apache::params::service_name] -> Class['::keystone::endpoint']
   } else {
+    $pacemaker_master = false
     $manage_roles = false
   }