Merge "increase_ulimits task needs to be executed on the openstack no…

…des, so moving it to the setup_orchestrator task."
Juniper · Dec 7, 2014 · cc1a8f8 · cc1a8f8
2 parents bbab725 + 38f86c4
commit cc1a8f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fabfile/tasks/install.py b/fabfile/tasks/install.py
@@ -502,6 +502,7 @@ def create_install_repo_node(*args):
 def install_orchestrator():
     if get_orchestrator() is 'openstack':
         execute(install_openstack)
+        execute(update_keystone_log)
 
 @roles('build')
 @task
@@ -518,7 +519,6 @@ def install_contrail(reboot='True'):
     execute(install_webui)
     execute(install_vrouter)
     execute(upgrade_pkgs)
-    execute(update_keystone_log)
     if getattr(env, 'interface_rename', True):
         print "Installing interface Rename package and rebooting the system."
         execute(install_interface_name, reboot)

diff --git a/fabfile/tasks/provision.py b/fabfile/tasks/provision.py
@@ -1482,6 +1482,7 @@ def cleanup_remote_syslog_node():
 def setup_orchestrator():
     orch = get_orchestrator()
     if orch == 'openstack':
+        execute('increase_ulimits')
         execute('setup_openstack')
         if get_openstack_internal_vip():
             execute('sync_keystone_ssl_certs')
@@ -1498,7 +1499,6 @@ def setup_all(reboot='True'):
     execute('setup_ha')
     execute('setup_rabbitmq_cluster')
     execute('increase_limits')
-    execute('increase_ulimits')
     execute('setup_database')
     execute('verify_database')
     execute('setup_orchestrator')