From e027fe09db24b7e09103f0947af28a869e61f2f6 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 9 Jun 2016 09:20:40 -0400
Subject: Add pacemaker nuage profile.

The pacemaker version of nuage has its DB sync at a different
step so we need a separate profile to ensure plugin.ini exists.

Change-Id: Ia4a297008b259a8e238bd1ad511e82f4e5ab6d63
---
 manifests/profile/base/neutron/nuage.pp            | 31 -------------------
 manifests/profile/base/neutron/plugins/nuage.pp    | 35 ++++++++++++++++++++++
 .../profile/pacemaker/neutron/plugins/nuage.pp     | 33 ++++++++++++++++++++
 3 files changed, 68 insertions(+), 31 deletions(-)
 delete mode 100644 manifests/profile/base/neutron/nuage.pp
 create mode 100644 manifests/profile/base/neutron/plugins/nuage.pp
 create mode 100644 manifests/profile/pacemaker/neutron/plugins/nuage.pp

(limited to 'manifests')

diff --git a/manifests/profile/base/neutron/nuage.pp b/manifests/profile/base/neutron/nuage.pp
deleted file mode 100644
index 62e6c4f..0000000
--- a/manifests/profile/base/neutron/nuage.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2014 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:nuage:
-#
-# Nuage Neutron profile for tripleo
-#
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-class tripleo::profile::base::neutron::nuage (
-  $step = hiera('step'),
-) {
-  include ::tripleo::profile::base::neutron::server
-  if $step >= 4 {
-    include ::neutron::plugins::nuage
-  }
-}
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
new file mode 100644
index 0000000..20f93db
--- /dev/null
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -0,0 +1,35 @@
+# Copyright 2014 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::plugins::nuage
+#
+# Nuage Neutron profile for tripleo
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+# [*sync_db*]
+#   (Optional) Whether to run Neutron DB sync operations
+#   Defaults to undef
+#
+class tripleo::profile::base::neutron::plugins::nuage (
+  $step    = hiera('step'),
+  $sync_db = true,
+) {
+  if $step >= 4 or ( $step >= 3 and $sync_db ) {
+    include ::neutron::plugins::nuage
+  }
+}
diff --git a/manifests/profile/pacemaker/neutron/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
new file mode 100644
index 0000000..6b38884
--- /dev/null
+++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
@@ -0,0 +1,33 @@
+# 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::plugins::nuage
+#
+# Nuage Neutron profile for tripleo pacemaker
+#
+# === Parameters
+#
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid')
+#
+class tripleo::profile::pacemaker::neutron::plugins::nuage (
+  $pacemaker_master = hiera('bootstrap_nodeid'),
+) {
+
+  class { '::tripleo::profile::base::neutron::plugins::nuage':
+    sync_db => ($::hostname == downcase($pacemaker_master))
+  }
+
+}
-- 
cgit 1.2.3-korg