From ae5bfa0e96487fce727195f7093199428f0b7d14 Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Christopher Date: Thu, 6 Oct 2016 12:30:02 -0700 Subject: [PATCH] Fix mainline fab provisioning issues Closes-Bug: 1630691 Change-Id: Ifb6c606f0e34fd3bcb5956998109b767d36cde1c --- contrail_provisioning/config/common.py | 14 -------------- contrail_provisioning/config/setup.py | 10 ---------- contrail_provisioning/config/upgrade.py | 5 ----- 3 files changed, 29 deletions(-) diff --git a/contrail_provisioning/config/common.py b/contrail_provisioning/config/common.py index 6f415b18..6faad87e 100755 --- a/contrail_provisioning/config/common.py +++ b/contrail_provisioning/config/common.py @@ -313,20 +313,6 @@ def fixup_discovery_initd(self): local("sudo mv %s/contrail-discovery /etc/init.d/" %(self._temp_dir_name)) local("sudo chmod a+x /etc/init.d/contrail-discovery") - def fixup_vnc_api_lib_ini(self): - # vnc_api_lib.ini - authn_url = '/v3/auth/tokens' if 'v3' in self._args.keystone_version else '/v2.0/tokens' - template_vals = { - '__contrail_keystone_ip__': '127.0.0.1', - '__contrail_authn_url__': authn_url, - } - self._template_substitute_write(vnc_api_lib_ini.template, - template_vals, self._temp_dir_name + '/vnc_api_lib.ini') - local("sudo mv %s/vnc_api_lib.ini /etc/contrail/" %(self._temp_dir_name)) - # Remove the auth setion from /etc/contrail/vnc_api_lib.ini, will be added by - # Orchestrator specific setup if required. - local("sudo openstack-config --del /etc/contrail/vnc_api_lib.ini auth") - def fixup_contrail_sudoers(self): # sudoers for contrail template_vals = { diff --git a/contrail_provisioning/config/setup.py b/contrail_provisioning/config/setup.py index 52377287..ceb8e564 100755 --- a/contrail_provisioning/config/setup.py +++ b/contrail_provisioning/config/setup.py @@ -149,15 +149,6 @@ def parse_args(self, args_str): if not self._args.neutron_password: self._args.neutron_password = self._args.keystone_admin_passwd - def provision_alarm(self): - alarm_args = "--api_server_ip %s" % self._args.self_ip - alarm_args += " --api_server_port 8082" - alarm_args += " --admin_user %s" % self._args.keystone_admin_user - alarm_args += " --admin_password %s" % self._args.keystone_admin_passwd - alarm_args += " --admin_tenant_name %s" % self._args.keystone_admin_tenant_name - if (self.api_ssl_enabled == True): - alarm_args += " --api_server_use_ssl True" - local("sudo python /opt/contrail/utils/provision_alarm.py %s" % alarm_args) def main(args_str = None): config_setup = ConfigSetup(args_str) @@ -170,7 +161,6 @@ def main(args_str = None): # Defaults to provision only contrail config without Orchestrator. config = ConfigBaseSetup(config_args) config.setup() - config_setup.provision_alarm() def fix_cfgm_config_files(args_str=None): config_args = ConfigSetup(args_str)._args diff --git a/contrail_provisioning/config/upgrade.py b/contrail_provisioning/config/upgrade.py index bdc4814c..34a37b39 100644 --- a/contrail_provisioning/config/upgrade.py +++ b/contrail_provisioning/config/upgrade.py @@ -109,11 +109,6 @@ def upgrade(self): self.del_config(conf_file, 'DEFAULTS', 'rabbit_port') self.set_config(conf_file, 'DEFAULTS', 'rabbit_server', self.config_setup.rabbit_servers) - # Provision alarm during upgrade - if (self._args.from_rel < LooseVersion('3.2.0.0') and - self._args.to_rel >= LooseVersion('3.2.0.0')): - self.provision_alarm() - def main():