Modified the function call in upgrade.py as the function definations …

…have changed

and correcting the indentation.
Closes-Bug: 1494497

Change-Id: Idbfe4974edc5ccd32301c695624429c63bf65b38

fabfile/tasks/provision.py

@@ -1507,14 +1507,14 @@ def prov_config_node(host_string, oper='add', tgt_node=None):
             tgt_ip = hstr_to_ip(get_control_host_string(env.host_string))
             tgt_hostname = sudo("hostname")
 
-    with cd(UTILS_DIR):
-        cmd = "python provision_config_node.py"
-        cmd += " --api_server_ip %s" % cfgm_ip
-        cmd += " --host_name %s" % tgt_hostname
-        cmd += " --host_ip %s" % tgt_ip
-        cmd += " --oper %s" % oper
-        cmd += " %s" % get_mt_opts()
-        sudo(cmd)
+        with cd(UTILS_DIR):
+            cmd = "python provision_config_node.py"
+            cmd += " --api_server_ip %s" % cfgm_ip
+            cmd += " --host_name %s" % tgt_hostname
+            cmd += " --host_ip %s" % tgt_ip
+            cmd += " --oper %s" % oper
+            cmd += " %s" % get_mt_opts()
+            sudo(cmd)
 #end prov_config_node
 
 @task

fabfile/tasks/upgrade.py

@@ -247,9 +247,9 @@ def upgrade_contrail(from_rel, pkg, orch='yes'):
     execute('upgrade_compute', from_rel, pkg)
     # Adding config, database and analytics nodes to api-server
     if float(from_rel) < 2.2:
-        execute('prov_config_node')
-        execute('prov_database_node')
-        execute('prov_analytics_node')
+        execute('prov_config')
+        execute('prov_database')
+        execute('prov_analytics')
     execute('compute_reboot')
     #Clear the connections cache
     connections.clear()