From 7cf2fd4387c9e4784e2130c0f3439b0f9be98c93 Mon Sep 17 00:00:00 2001
From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Thu, 5 Nov 2015 20:11:15 +0300
Subject: [PATCH] Refactor redis tasks for controller nodes

* Remove duplication of starting manifests
* Remove excess lines from metadata

Change-Id: I1ad0b69150d21e54ef107d49ee0d9245f062b849
---
 .../puppet/manifests/controller.pp            |  2 +-
 .../puppet/manifests/primary-controller.pp    | 34 -------------------
 metadata.yaml                                 |  5 ---
 tasks.yaml                                    | 10 +-----
 4 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 deployment_scripts/puppet/manifests/primary-controller.pp

diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp
index 857ef23..4b4e2f7 100644
--- a/deployment_scripts/puppet/manifests/controller.pp
+++ b/deployment_scripts/puppet/manifests/controller.pp
@@ -30,5 +30,5 @@ class {'::redis::main':
   primary_redis_node => $primary_redis_node[0],
   redis_hosts        => $redis_hosts,
   redis_bind_address => $redis_bind_address,
-  primary_controller => false,
+  primary_controller => hiera('primary_controller'),
 }
diff --git a/deployment_scripts/puppet/manifests/primary-controller.pp b/deployment_scripts/puppet/manifests/primary-controller.pp
deleted file mode 100644
index 513387d..0000000
--- a/deployment_scripts/puppet/manifests/primary-controller.pp
+++ /dev/null
@@ -1,34 +0,0 @@
-#    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.
-
-prepare_network_config(hiera('network_scheme', {}))
-
-$redis_roles = ["primary-controller", "controller"]
-$redis_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), $redis_roles)
-# Use ceilometer network role
-$redis_address_map  = get_node_to_ipaddr_map_by_network_role($redis_nodes, 'ceilometer/api')
-$redis_hosts        = values($redis_address_map)
-$redis_bind_address = get_network_role_property('ceilometer/api', 'ipaddr')
-
-# Set primary redis on primary-controller
-$redis_primary_nodes       = get_nodes_hash_by_roles(hiera('network_metadata'), ["primary-controller"])
-$redis_primary_address_map = get_node_to_ipaddr_map_by_network_role($redis_primary_nodes, 'ceilometer/api')
-$primary_redis_node        = values($redis_primary_address_map)
-
-class {'::redis::main':
-  primary_redis_node => $primary_redis_node[0],
-  redis_hosts        => $redis_hosts,
-  redis_bind_address => $redis_bind_address,
-  primary_controller => true,
-}
diff --git a/metadata.yaml b/metadata.yaml
index b375803..7cbbb2a 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -24,11 +24,6 @@ releases:
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
-#  - os: centos
-#    version: 2015.1.0-7.0
-#    mode: ['ha']
-#    deployment_scripts_path: deployment_scripts/
-#    repository_path: repositories/centos
 
 # Version of plugin package
 package_version: '2.0.0'
diff --git a/tasks.yaml b/tasks.yaml
index 9cc7ec9..aba2a77 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,12 +1,4 @@
-- role: ['primary-controller']
-  stage: post_deployment
-  type: puppet
-  parameters:
-    puppet_manifest: puppet/manifests/primary-controller.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720
-
-- role: ['controller']
+- role: ['primary-controller', 'controller']
   stage: post_deployment
   type: puppet
   parameters: