diff --git a/scripts/opencontrail_compute_install.sh b/scripts/opencontrail_compute_install.sh
index d4dbcd3..5def090 100755
--- a/scripts/opencontrail_compute_install.sh
+++ b/scripts/opencontrail_compute_install.sh
@@ -17,7 +17,7 @@
 
 # Provision opencontrail virtual routers
 hosts=($(salt-call pillar.get linux:network:host | egrep 'cmp0.*:' | sed -e 's/  *//' -e 's/://'))
-vip=$(salt-call pillar.get _param:openstack_control_address | grep '^ ' | sed -e 's/  *//')
+vip=$(salt-call pillar.get _param:opencontrail_control_address | grep '^ ' | sed -e 's/  *//')
 nb=$(( ${#hosts[@]} - 1 ))
 for i in $(seq 0 $nb); do
     h=${hosts[$i]}
diff --git a/scripts/opencontrail_control_install.sh b/scripts/opencontrail_control_install.sh
index f83053f..7173691 100755
--- a/scripts/opencontrail_control_install.sh
+++ b/scripts/opencontrail_control_install.sh
@@ -17,8 +17,8 @@
 salt -C 'I@opencontrail:control' state.sls opencontrail -b 1
 
 # Provision opencontrail control services
-hosts=($(get_nodes_names "ctl[0-9]"))
-vip=$(salt-call pillar.get _param:openstack_control_address | grep '^ ' | sed -e 's/  *//')
+hosts=($(salt -C 'I@opencontrail:control' test.ping | egrep ':$' | cut -d \. -f 1))
+vip=$(salt-call pillar.get _param:opencontrail_control_address | grep '^ ' | sed -e 's/  *//')
 nb=$(( ${#hosts[@]} - 1 ))
 for i in $(seq 0 $nb); do
     h=${hosts[$i]}