Merge "Provisioning changes to integrate OSP-Director with Contrail P…

…artial-Bug: 1645502" into R3.0

contrail_provisioning/common/keepalived_setup.py

@@ -9,13 +9,15 @@
 import netaddr
 import netifaces
 import ConfigParser
+import platform
 
 from fabric.api import local
 
 from contrail_provisioning.common.base import ContrailSetup
 from contrail_provisioning.compute.network import ComputeNetworkSetup
 from contrail_provisioning.common.templates import keepalived_conf_template
 
+(PLATFORM, VERSION, EXTRA) = platform.linux_distribution()
 
 class KeepalivedSetup(ContrailSetup, ComputeNetworkSetup):
     def __init__(self, args_str = None):
@@ -112,7 +114,10 @@ def fixup_config_files(self):
         local("sudo mv %s/keepalived.conf /etc/keepalived/" %(self._temp_dir_name))
 
     def run_services(self):
-        local("service keepalived restart")
+        if PLATFORM.lower() == 'ubuntu':
+            local("sudo chkconfig keepalived on && sudo service keepalived restart")
+        else:
+            local("sudo systemctl enable keepalived && sudo systemctl restart keepalived")
 
 def main(args_str = None):
     keepalived = KeepalivedSetup(args_str)

contrail_provisioning/config/common.py

@@ -54,6 +54,7 @@ def __init__(self, config_args, args_str=None):
             amqp_ip_list = self._args.amqp_ip_list
         self.rabbit_servers = ','.join(['%s:%s' % (amqp, self._args.amqp_port)\
                                         for amqp in amqp_ip_list])
+        self.amqp_password = self._args.amqp_password or ''
         self.contrail_internal_vip = (self._args.contrail_internal_vip or
                                  self._args.internal_vip)
         self.api_ssl_enabled = False
@@ -139,6 +140,8 @@ def fixup_contrail_api_config_file(self):
         self._template_substitute_write(contrail_api_conf.template,
                                         template_vals, self._temp_dir_name + '/contrail-api.conf')
         local("sudo mv %s/contrail-api.conf /etc/contrail/" %(self._temp_dir_name))
+        if self.amqp_password:
+            local("sudo openstack-config --set /etc/contrail/contrail-api.conf DEFAULTS rabbit_password %s" % self.amqp_password)
 
     def fixup_contrail_api_supervisor_ini(self, config_files=['/etc/contrail/contrail-api.conf', '/etc/contrail/contrail-database.conf']):
         # supervisor contrail-api.ini
@@ -200,6 +203,8 @@ def fixup_schema_transformer_config_file(self):
                                         template_vals, self._temp_dir_name + '/contrail-schema.conf')
         local("sudo mv %s/contrail-schema.conf /etc/contrail/contrail-schema.conf" %(self._temp_dir_name))
         local("sudo chmod a+x /etc/init.d/contrail-schema")
+        if self.amqp_password:
+            local("sudo openstack-config --set /etc/contrail/contrail-schema.conf DEFAULTS rabbit_password %s" % self.amqp_password)
 
     def fixup_device_manager_ini(self,config_files=
                                       ['/etc/contrail/contrail-device-manager.conf',
@@ -231,6 +236,8 @@ def fixup_device_manager_config_file(self):
                                         template_vals, self._temp_dir_name + '/contrail-device-manager.conf')
         local("sudo mv %s/contrail-device-manager.conf /etc/contrail/contrail-device-manager.conf" %(self._temp_dir_name))
         #local("sudo chmod a+x /etc/init.d/contrail-device-manager")
+        if self.amqp_password:
+            local("sudo openstack-config --set /etc/contrail/contrail-device-manager.conf DEFAULTS rabbit_password %s" % self.amqp_password)
 
     def fixup_svc_monitor_config_file(self):
         # contrail-svc-monitor.conf
@@ -257,6 +264,8 @@ def fixup_svc_monitor_config_file(self):
         self._template_substitute_write(contrail_svc_monitor_conf.template,
                                         template_vals, self._temp_dir_name + '/contrail-svc-monitor.conf')
         local("sudo mv %s/contrail-svc-monitor.conf /etc/contrail/contrail-svc-monitor.conf" %(self._temp_dir_name))
+        if self.amqp_password:
+            local("sudo openstack-config --set /etc/contrail/contrail-svc-monitor.conf DEFAULTS rabbit_password %s" % self.amqp_password)
 
     def fixup_discovery_config_file(self):
         # discovery.conf_

contrail_provisioning/config/openstack.py

@@ -193,7 +193,8 @@ def run_services(self):
             local("setup-quantum-in-keystone %s" %(quant_args))
 
         super(ConfigOpenstackSetup, self).run_services()
-        local("sudo quantum-server-setup.sh")
+        if self._args.provision_neutron_server == 'yes':
+            local("sudo quantum-server-setup.sh")
 
     def setup(self):
         self.disable_selinux()

contrail_provisioning/config/setup.py

@@ -46,8 +46,10 @@ def __init__(self, args_str = None):
             'quantum_port': '9696',
             'quantum_service_protocol': 'http',
             'manage_neutron': 'yes',
+            'provision_neutron_server': 'yes',
             'orchestrator' : 'openstack',
             'amqp_port': '5672',
+            'amqp_password': '',
             'keystone_insecure': False,
             'keystone_certfile': None,
             'keystone_keyfile': None,
@@ -131,9 +133,11 @@ def parse_args(self, args_str):
         # TODO END
         parser.add_argument("--amqp_ip_list", nargs='+', type=str,
             help = "IP of the AMQP server to be used for neutron and config services")
+        parser.add_argument("--amqp_password", help = "AMQP (RabbitMQ) Password")
         parser.add_argument("--amqp_port",
             help = "IP of the AMQP server port to be used for neutron and config services")
         parser.add_argument("--manage_neutron", help = "Provision neutron user/role in Keystone.")
+        parser.add_argument("--provision_neutron_server", help = "Provision neutron server in config nodes.")
         parser.add_argument("--internal_vip", help = "VIP Address of openstack  nodes")
         parser.add_argument("--external_vip", help = "External VIP Address of HA Openstack Nodes")
         parser.add_argument("--contrail_internal_vip", help = "Internal VIP Address of HA config Nodes")