Merge "Provision zookeeper in config node instead of database node. p…

…oint collector services to zookeeper in config node." into R3.1

contrail_provisioning/config/common.py

@@ -370,26 +370,28 @@ def run_services(self):
                 print "[contrail-api and rabbitmq] started by supervisor config, continue to provision."
                 return
 
-    def setup_cassandra(self):
+    def setup_database(self):
+        db = DatabaseCommon()
+        db.fixup_zookeeper_configs(self._args.zookeeper_ip_list,
+                                   self._args.cfgm_index)
+        db_services = ['zookeeper']
         if self._args.manage_db:
-            db = DatabaseCommon()
             db.fixup_etc_hosts_file(self._args.self_ip, self.hostname)
             db.fixup_cassandra_config_file(self._args.self_ip,
                                            self._args.seed_list,
                                            self._args.data_dir,
                                            self._args.ssd_data_dir,
                                            cluster_name='ContrailConfigDB')
             db.fixup_cassandra_env_config()
-            #db.fixup_zookeeper_configs(self._args.zookeeper_ip_list)
-            local('sudo chkconfig contrail-database on')
-            local('sudo service contrail-database restart')
-            #local('sudo chkconfig zookeeper on')
-            #local('sudo service zookeeper restart')
+            db_services.append('contrail-database')
+        for svc in db_services:
+            local('sudo chkconfig %s on' % svc)
+            local('sudo service %s restart' % svc)
 
     def setup(self):
         self.disable_selinux()
         self.disable_iptables()
         self.setup_coredump()
-        self.setup_cassandra()
+        self.setup_database()
         self.fixup_config_files()
         self.run_services()

contrail_provisioning/config/openstack.py

@@ -199,7 +199,7 @@ def setup(self):
         self.disable_selinux()
         self.disable_iptables()
         self.setup_coredump()
-        self.setup_cassandra()
+        self.setup_database()
         self.fixup_config_files()
         self.build_ctrl_details()
         self.run_services()

contrail_provisioning/config/setup.py

@@ -20,6 +20,7 @@ def __init__(self, args_str = None):
 
         self.global_defaults = {
             'self_ip': '127.0.0.1',
+            'cfgm_index' : 1,
             'collector_ip': '127.0.0.1',
             'keystone_ip': '127.0.0.1',
             'keystone_admin_user': 'admin',
@@ -72,6 +73,7 @@ def parse_args(self, args_str):
         parser = self._parse_args(args_str)
 
         parser.add_argument("--self_ip", help = "IP Address of this system")
+        parser.add_argument("--cfgm_index", help = "The index of this cfgm node")
         parser.add_argument("--collector_ip", help = "IP Address of collector node")
         parser.add_argument("--keystone_ip", help = "IP Address of keystone node")
         parser.add_argument("--keystone_admin_user", help = "Keystone admin tenant user.")

contrail_provisioning/database/base.py

@@ -137,7 +137,7 @@ def fixup_cassandra_env_config(self):
         for pattern_to_match, str_to_replace in env_file_settings:
             local("sudo sed -i 's/%s/%s/g' %s" % (pattern_to_match, str_to_replace, env_file))
 
-    def fix_zookeeper_servers_config(self, zookeeper_ip_list):
+    def fix_zookeeper_servers_config(self, zookeeper_ip_list, myid):
         zk_index = 1
         # Instead of inserting/deleting config, remove all the zoo keeper servers
         # and re-generate.
@@ -149,11 +149,13 @@ def fix_zookeeper_servers_config(self, zookeeper_ip_list):
 
         #put cluster-unique zookeeper's instance id in myid
         datadir = local('grep -oP "^dataDir=\K.*" %s/zoo.cfg' % self.zoo_conf_dir, capture=True)
-        local('sudo echo "%s" > %s/myid' %(self._args.database_index, datadir))
+        local('sudo echo "%s" > %s/myid' % (myid, datadir))
 
-    def fixup_zookeeper_configs(self, zookeeper_ip_list=None):
+    def fixup_zookeeper_configs(self, zookeeper_ip_list=None, myid=None):
         if not zookeeper_ip_list:
             zookeeper_ip_list = self._args.zookeeper_ip_list
+        if not myid:
+            myid = self._args.database_index
         # set high session timeout to survive glance led disk activity
         local('sudo echo "maxSessionTimeout=120000" >> %s/zoo.cfg' % self.zoo_conf_dir)
         local('sudo echo "autopurge.purgeInterval=3" >> %s/zoo.cfg' % self.zoo_conf_dir)
@@ -164,4 +166,4 @@ def fixup_zookeeper_configs(self, zookeeper_ip_list=None):
         if self.pdist == 'Ubuntu':
             local('echo ZOO_LOG4J_PROP="INFO,CONSOLE,ROLLINGFILE" >> %s/environment' % self.zoo_conf_dir)
 
-        self.fix_zookeeper_servers_config(zookeeper_ip_list)
+        self.fix_zookeeper_servers_config(zookeeper_ip_list, myid)

contrail_provisioning/database/scripts/database-server-setup.sh

@@ -3,13 +3,13 @@
 #setup script for analytics package under supervisord
 echo "======= Enabling the services ======"
 
-for svc in zookeeper supervisor-database contrail-database; do
+for svc in supervisor-database contrail-database; do
     chkconfig $svc on
 done
 
 echo "======= Starting the services ======"
 
-for svc in zookeeper supervisor-database contrail-database; do
+for svc in supervisor-database contrail-database; do
     service $svc restart
 done
 

contrail_provisioning/database/setup.py

@@ -132,7 +132,7 @@ def fixup_config_files(self):
 
         self.fixup_contrail_database_nodemgr()
 
-        self.fixup_zookeeper_configs()
+        #self.fixup_zookeeper_configs()
         self.fixup_kafka_server_properties(self.database_listen_ip)
 
     def fixup_kafka_server_properties(self, listen_ip):
@@ -294,7 +294,7 @@ def check_database_up(self):
             return False
 
     def restart(self):
-        local('service zookeeper restart')
+        #local('service zookeeper restart')
         local('service contrail-database restart')
         local('service supervisor-database restart')