Merge "Implement Nova conductor profile"

2 files changed, 80 insertions, 0 deletions

diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp
new file mode 100644
index 0000000..494bbc7
--- /dev/null
+++ b/manifests/profile/base/nova/conductor.pp
@@ -0,0 +1,35 @@
+# 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::nova::conductor
+#
+# Nova Conductor profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::nova::conductor (
+  $step = hiera('step'),
+) {
+
+  if $step >= 4 {
+    include ::tripleo::profile::base::nova
+    include ::nova::conductor
+  }
+
+}
diff --git a/manifests/profile/pacemaker/nova/conductor.pp b/manifests/profile/pacemaker/nova/conductor.pp
new file mode 100644
index 0000000..76dc462
--- /dev/null
+++ b/manifests/profile/pacemaker/nova/conductor.pp
@@ -0,0 +1,45 @@
+# 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::nova::conductor
+#
+# Nova Conductor with Pacemaker profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid')
+#
+class tripleo::profile::pacemaker::nova::conductor (
+  $step             = hiera('step'),
+  $pacemaker_master = hiera('bootstrap_nodeid'),
+) {
+
+  include ::nova::params
+  include ::tripleo::profile::pacemaker::nova
+  include ::tripleo::profile::base::nova::conductor
+
+  if $step >= 5 and downcase($::hostname) == $pacemaker_master {
+    pacemaker::resource::service { $::nova::params::conductor_service_name:
+      clone_params => 'interleave=true',
+    }
+  }
+
+}