From 36de4045b8466e4082cf14a6f5f55ee9838d5b25 Mon Sep 17 00:00:00 2001
From: nitishkrishna <nitishk@juniper.net>
Date: Tue, 6 Dec 2016 23:15:14 -0800
Subject: [PATCH] Closes-Bug: #161526 - To fix Centos config db separation

Config DB separation in Centos will fail in database started.
This issue was fixed in Database role but not for Config Db provision in Centos

Change-Id: Ie3a01daff00bd11cbe43467bec77d309d6966dc7
---
 .../modules/contrail/manifests/config/database.pp        | 9 +++++----
 .../contrail/manifests/config/database_service.pp        | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/contrail/environment/modules/contrail/manifests/config/database.pp b/contrail/environment/modules/contrail/manifests/config/database.pp
index ea4243c7..564394e9 100644
--- a/contrail/environment/modules/contrail/manifests/config/database.pp
+++ b/contrail/environment/modules/contrail/manifests/config/database.pp
@@ -12,6 +12,7 @@
   $database_minimum_diskGB = $::contrail::params::database_minimum_diskGB,
   $host_roles = $::contrail::params::host_roles,
   $config_manage_db = $::contrail::params::config_manage_db,
+  $zookeeper_conf_dir = $::contrail::params::zookeeper_conf_dir,
 ) {
     if (!('database' in $host_roles) and $config_manage_db == true) {
            $database_ip_list_to_use = $config_ip_list
@@ -31,7 +32,7 @@
             if ($::operatingsystem == 'Centos' or $::operatingsystem == 'Fedora') {
             $zk_myid_file = '/var/lib/zookeeper/myid'
             } else {
-            $zk_myid_file = '/etc/zookeeper/conf/myid'
+            $zk_myid_file = "${zookeeper_conf_dir}/myid"
             }
 
             # set database_index
@@ -85,7 +86,7 @@
                 contrail_cassandra_dir => $contrail_cassandra_dir,
                     cassandra_cluster_name => "\'ConfigContrail\'"
             } ->
-            file { '/etc/zookeeper/conf/zoo.cfg':
+            file { "${zookeeper_conf_dir}/zoo.cfg":
             ensure  => present,
             content => template("${module_name}/zoo.cfg.erb"),
             } ->
@@ -143,12 +144,12 @@
             # Below is temporary to work-around in Ubuntu as Service resource fails
             # as upstart is not correctly linked to /etc/init.d/service-name
             if ($::operatingsystem == 'Ubuntu') {
-            File['/etc/zookeeper/conf/zoo.cfg'] ->
+            File["${zookeeper_conf_dir}/zoo.cfg"] ->
             file { '/etc/init.d/supervisord-contrail-database':
                 ensure  => link,
                 target  => '/lib/init/upstart-job',
             } ->
-            File ['/etc/zookeeper/conf/log4j.properties'] -> File ['/etc/zookeeper/conf/environment'] ->
+            File ["${zookeeper_conf_dir}/log4j.properties"] -> File ["${zookeeper_conf_dir}/environment"] ->
             File [$zk_myid_file] ~> Service['zookeeper']
             }
             contain ::contrail::config_cassandra
diff --git a/contrail/environment/modules/contrail/manifests/config/database_service.pp b/contrail/environment/modules/contrail/manifests/config/database_service.pp
index d590f156..00e8096c 100644
--- a/contrail/environment/modules/contrail/manifests/config/database_service.pp
+++ b/contrail/environment/modules/contrail/manifests/config/database_service.pp
@@ -1,4 +1,6 @@
-class contrail::config::database_service {
+class contrail::config::database_service (
+  $zookeeper_conf_dir = $::contrail::params::zookeeper_conf_dir,
+){
     # enable zookeeper svc so that picked by systemctl
     if ($::operatingsystem == 'Centos' or $::operatingsystem == 'Fedora') {
         exec {"chkconfig-zookeeper" :
@@ -11,7 +13,7 @@
     service { 'zookeeper':
         ensure => running,
         enable => true,
-        subscribe => File['/etc/zookeeper/conf/zoo.cfg'],
+        subscribe => File["${zookeeper_conf_dir}/zoo.cfg"],
     }
     ->
     service { 'contrail-database' :