From 66e007426ceaacf0c1dc7fc5869264b8b8f6e112 Mon Sep 17 00:00:00 2001
From: Bartosz Kupidura <bkupidura@mirantis.com>
Date: Wed, 29 Jul 2015 14:18:57 +0200
Subject: [PATCH] Create group of resources for zabbix and mgmt vip

Change-Id: I15bd9d65f3730eead4c4816f7655c6f89977a886
Partial-Bug: #1478425
---
 .../puppet/manifests/primary_controller.pp    | 16 +++++++++++++
 .../manifests/params.pp                       |  3 +++
 .../manifests/primary_controller.pp           | 24 +++++++++++++++++++
 tasks.yaml                                    |  7 ++++++
 4 files changed, 50 insertions(+)
 create mode 100644 deployment_scripts/puppet/manifests/primary_controller.pp
 create mode 100644 deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/primary_controller.pp

diff --git a/deployment_scripts/puppet/manifests/primary_controller.pp b/deployment_scripts/puppet/manifests/primary_controller.pp
new file mode 100644
index 0000000..ea84d2d
--- /dev/null
+++ b/deployment_scripts/puppet/manifests/primary_controller.pp
@@ -0,0 +1,16 @@
+#
+#    Copyright 2015 Mirantis, 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.
+#
+include plugin_zabbix_snmptrapd::primary_controller
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/params.pp b/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/params.pp
index 13c7bed..9d0eaa9 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/params.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/params.pp
@@ -29,4 +29,7 @@ class plugin_zabbix_snmptrapd::params {
     }
   }
 
+  $zabbix_cs_name = 'p_zabbix-server'
+  $vip_cs_name = 'vip__management'
+
 }
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/primary_controller.pp b/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/primary_controller.pp
new file mode 100644
index 0000000..e744f3d
--- /dev/null
+++ b/deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/primary_controller.pp
@@ -0,0 +1,24 @@
+#
+#    Copyright 2015 Mirantis, 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 plugin_zabbix_snmptrapd::primary_controller {
+
+  include plugin_zabbix_snmptrapd::params
+
+  cs_group { 'g_zabbix':
+    primitives => [$plugin_zabbix_snmptrapd::params::vip_cs_name, $plugin_zabbix_snmptrapd::params::zabbix_cs_name],
+  }
+
+}
diff --git a/tasks.yaml b/tasks.yaml
index 87638fe..617b52a 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -5,3 +5,10 @@
     puppet_manifest: puppet/manifests/controller.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 1200
+- role: ['primary-controller']
+  stage: post_deployment/8115
+  type: puppet
+  parameters:
+    puppet_manifest: puppet/manifests/primary_controller.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 1200