diff options
Diffstat (limited to 'deploy/client.py')
| -rw-r--r-- | deploy/client.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/deploy/client.py b/deploy/client.py index 593f9033..a87decc9 100644 --- a/deploy/client.py +++ b/deploy/client.py @@ -235,6 +235,9 @@ opts = [ cfg.StrOpt('rsa_file', help='ssh rsa key file', default=''), + cfg.StrOpt('odl_l3_agent', + help='odl l3 agent enable flag', + default='Disable'), ] CONF.register_cli_opts(opts) @@ -723,6 +726,7 @@ class CompassClient(object): package_config['enable_secgroup'] = (CONF.enable_secgroup == "true") package_config['enable_fwaas'] = (CONF.enable_fwaas== "true") package_config['enable_vpnaas'] = (CONF.enable_vpnaas== "true") + package_config['odl_l3_agent'] = "Enable" if CONF.odl_l3_agent == "Enable" else "Disable" status, resp = self.client.update_cluster_config( cluster_id, package_config=package_config) @@ -871,11 +875,11 @@ class CompassClient(object): (cluster_id, status, cluster_state) ) - LOG.info("current_time=%s, deployment_timeout=%s" \ - % (current_time(), deployment_timeout)) time.sleep(5) - if not current_time() < deployment_timeout: + if current_time() >= deployment_timeout: + LOG.info("current_time=%s, deployment_timeout=%s" \ + % (current_time(), deployment_timeout)) raise RuntimeError("installation timeout") try: |