2
< with settings(host_string = 'root@%s' %(cfgm_ip), password = env.password):
3
< prov_args = "--host_name %s --host_ip %s --api_server_ip %s --oper add " \
4
< "--admin_user %s --admin_password %s --admin_tenant_name %s" \
5
< %(compute_hostname, compute_ip, cfgm_ip, ks_admin_user, ks_admin_password, ks_admin_tenant_name)
6
< run(". /opt/contrail/api-venv/bin/activate && python /opt/contrail/utils/provision_vrouter.py %s" %(prov_args))
8
> prov_args = "--host_name %s --host_ip %s --api_server_ip %s --oper add " \
9
> "--admin_user %s --admin_password %s --admin_tenant_name %s" \
10
> %(compute_hostname, compute_ip, cfgm_ip, ks_admin_user, ks_admin_password, ks_admin_tenant_name)
11
> local(". /opt/contrail/api-venv/bin/activate && python /opt/contrail/utils/provision_vrouter.py %s" %(prov_args))
1
--- setup.py.link 2014-01-10 15:03:23.000000000 -0800
2
+++ setup.py 2014-02-25 07:34:38.148867948 -0800
3
@@ -1299,11 +1299,10 @@ SUBCHANNELS=1,2 3
4
cfgm_ip = self._args.cfgm_ip
5
compute_ip = self._args.compute_ip
6
compute_hostname = socket.gethostname()
7
- with settings(host_string = 'root@%s' %(cfgm_ip), password = env.password):
8
- prov_args = "--host_name %s --host_ip %s --api_server_ip %s --oper add " \
9
- "--admin_user %s --admin_password %s --admin_tenant_name %s" \
10
- %(compute_hostname, compute_ip, cfgm_ip, ks_admin_user, ks_admin_password, ks_admin_tenant_name)
11
- run(". /opt/contrail/api-venv/bin/activate && python /opt/contrail/utils/provision_vrouter.py %s" %(prov_args))
12
+ prov_args = "--host_name %s --host_ip %s --api_server_ip %s --oper add " \
13
+ "--admin_user %s --admin_password %s --admin_tenant_name %s" \
14
+ %(compute_hostname, compute_ip, cfgm_ip, ks_admin_user, ks_admin_password, ks_admin_tenant_name)
15
+ local(". /opt/contrail/api-venv/bin/activate && python /opt/contrail/utils/provision_vrouter.py %s" %(prov_args))
18
def enable_services(self):
added
removed
precise/contrail-webui/hooks/charmhelpers/contrib/contrail/patches/setup.py
