13 files changed, 98 insertions, 119 deletions
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index a7d62ce..97e1bb8 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -23,18 +23,16 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*pacemaker_master*]
-#   (Optional) The master node runs some tasks
-#   one step earlier than others; disable to
-#   the node is not the master.
+# [*sync_db*]
+#   (Optional) Whether to run db sync
 #   Defaults to true
-
+#
 class tripleo::profile::base::ceilometer (
   $step             = hiera('step'),
-  $pacemaker_master = true,
+  $sync_db = true,
 ) {
 
-  if $step >= 4 or ($step >= 3 and $pacemaker_master) {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::ceilometer
     include ::ceilometer::db
     include ::ceilometer::config
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp
index 6891f9c..34ee90b 100644
--- a/manifests/profile/base/ceilometer/collector.pp
+++ b/manifests/profile/base/ceilometer/collector.pp
@@ -33,9 +33,7 @@ class tripleo::profile::base::ceilometer::collector (
   $sync_db = true,
 ) {
 
-  class { '::tripleo::profile::base::ceilometer':
-    pacemaker_master => $sync_db,
-  }
+  include ::tripleo::profile::base::ceilometer
 
   if $step >= 3 and $sync_db {
     $ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb'))
diff --git a/manifests/profile/base/neutron/ml2.pp b/manifests/profile/base/neutron/ml2.pp
deleted file mode 100644
index 59c74c8..0000000
--- a/manifests/profile/base/neutron/ml2.pp
+++ /dev/null
@@ -1,64 +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::neutron::ml2
-#
-# Neutron ML2 driver profile for tripleo
-#
-# === Parameters
-#
-# [*mechanism_drivers*]
-#   (Optional) The mechanism drivers to use with the Ml2 plugin
-#   Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
-#
-# [*sync_db*]
-# (Optional) Whether to run Neutron DB sync operations
-# Defaults to undef
-#
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-class tripleo::profile::base::neutron::ml2 (
-  $mechanism_drivers  = hiera('neutron::plugins::ml2::mechanism_drivers'),
-  $sync_db            = true,
-  $step               = hiera('step'),
-) {
-
-  warning('This class is going is deprecated and will be removed very soon, replaced by tripleo::profile::base::neutron::plugins::ml2.')
-
-  if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::neutron::plugins::ml2
-    include ::tripleo::profile::base::neutron
-
-    if 'cisco_n1kv' in $mechanism_drivers {
-      include ::tripleo::profile::base::neutron::n1k
-    }
-
-    if 'cisco_ucsm' in $mechanism_drivers {
-      include ::neutron::plugins::ml2::cisco::ucsm
-    }
-
-    if 'cisco_nexus'  in $mechanism_drivers {
-      include ::neutron::plugins::ml2::cisco::nexus
-      include ::neutron::plugins::ml2::cisco::type_nexus_vxlan
-    }
-
-    if 'bsn_ml2' in $mechanism_drivers {
-      include ::neutron::plugins::ml2::bigswitch::restproxy
-      include ::neutron::agents::bigswitch
-    }
-  }
-}
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index b462e1b..04c6244 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -37,9 +37,10 @@ class tripleo::profile::base::neutron::plugins::ml2 (
   $step               = hiera('step'),
 ) {
 
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::ml2
-    include ::tripleo::profile::base::neutron
 
     if 'cisco_n1kv' in $mechanism_drivers {
       include ::tripleo::profile::base::neutron::n1k
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index 20f93db..5d3661e 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -29,6 +29,9 @@ class tripleo::profile::base::neutron::plugins::nuage (
   $step    = hiera('step'),
   $sync_db = true,
 ) {
+
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::nuage
   }
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index 1fcb627..96d7421 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -29,6 +29,9 @@ class tripleo::profile::base::neutron::plugins::opencontrail (
   $step    = hiera('step'),
   $sync_db = true,
 ) {
+
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::opencontrail
   }
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index 7f645b9..f5cd273 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -31,6 +31,9 @@ class tripleo::profile::base::neutron::plugins::plumgrid (
   $step    = hiera('step'),
   $sync_db = true,
 ) {
+
+  include ::tripleo::profile::base::neutron
+
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::plumgrid
   }
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 320f83c..8b5539e 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -29,7 +29,7 @@ class tripleo::profile::base::neutron::server (
 
   include ::tripleo::profile::base::neutron
 
-  if $step >= 2 {
+  if $step >= 3 {
     include ::neutron::db::mysql
   }
 
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/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 4064b1e..3b36c57 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -34,10 +34,9 @@ class tripleo::profile::base::nova::api (
 
   include ::tripleo::profile::base::nova
 
-  if $step >= 2 and $sync_db {
+  if $step >= 3 and $sync_db {
     include ::nova::db::mysql
     include ::nova::db::mysql_api
-    Exec<| title == 'galera-ready'|> -> Anchor['nova::db::begin']
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
new file mode 100644
index 0000000..371cb0d
--- /dev/null
+++ b/manifests/profile/base/swift/storage.pp
@@ -0,0 +1,52 @@
+# 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::swift::storage
+#
+# Swift storage profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+# [*enable_swift_storage*]
+#   (Optional) enable_swift_storage
+#   Deprecated: defaults to true
+#
+class tripleo::profile::base::swift::storage (
+  $step                 = hiera('step'),
+  # Deprecated conditional to support ControllerEnableSwiftStorage parameter
+  $enable_swift_storage = true,
+) {
+
+  if $step >= 4 {
+    if $enable_swift_storage {
+      include ::swift::storage::all
+      if(!defined(File['/srv/node'])) {
+        file { '/srv/node':
+          ensure  => directory,
+          owner   => 'swift',
+          group   => 'swift',
+          require => Package['openstack-swift'],
+        }
+      }
+      $swift_components = ['account', 'container', 'object']
+      swift::storage::filter::recon { $swift_components : }
+      swift::storage::filter::healthcheck { $swift_components : }
+    }
+  }
+}
diff --git a/manifests/profile/pacemaker/neutron/ml2.pp b/manifests/profile/pacemaker/neutron/ml2.pp
deleted file mode 100644
index ab5a219..0000000
--- a/manifests/profile/pacemaker/neutron/ml2.pp
+++ /dev/null
@@ -1,38 +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::pacemaker::neutron::ml2
-#
-# Neutron ML2 driver Pacemaker HA profile for tripleo
-#
-# === Parameters
-#
-# [*pacemaker_master*]
-#   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid')
-#
-class tripleo::profile::pacemaker::neutron::ml2 (
-  $pacemaker_master = hiera('bootstrap_nodeid'),
-) {
-
-  warning('This class is going is deprecated and will be removed very soon, replaced by tripleo::profile::pacemaker::neutron::plugins::ml2.')
-
-  include ::neutron::params
-  include ::tripleo::profile::pacemaker::neutron
-
-  class { '::tripleo::profile::base::neutron::plugins::ml2':
-    sync_db => ($::hostname == downcase($pacemaker_master))
-  }
-
-}
diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index 0bad1b9..13dfd9b 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -36,9 +36,8 @@ class tripleo::profile::pacemaker::neutron::server (
   include ::tripleo::profile::pacemaker::neutron
 
   $sync_db = ($::hostname == downcase($pacemaker_master))
-  if $step >= 2 and $sync_db {
+  if $step >= 3 and $sync_db {
     include ::neutron::db::mysql
-    Exec<| title == 'galera-ready'|> -> Class['neutron::db::mysql']
   }
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {