commit 5647283b0cdb094db406c229b59cd560d19ed9b6
author Scott Baker <smbaker@gmail.com> Wed Dec 16 21:53:38 2015 -0800
committer Scott Baker <smbaker@gmail.com> Wed Dec 16 21:53:38 2015 -0800
tree 46d04c3226f59b1b8678b12b49768efb5630e03d
parent 532693adcebf62345a18b78d677aa24e7c32b0b1

perm fix

xos/configurations/cord/make-vtn-networkconfig-json.sh

diff --git a/xos/configurations/cord/make-vtn-networkconfig-json.sh b/xos/configurations/cord/make-vtn-networkconfig-json.sh
index 44f6607..17ce361 100755
--- a/xos/configurations/cord/make-vtn-networkconfig-json.sh
+++ b/xos/configurations/cord/make-vtn-networkconfig-json.sh
@@ -37,6 +37,9 @@
     fi
 done
 
+# get the openstack admin password and username
+source /root/setup/admin-openrc.sh
+
 HOSTNAME=`hostname`
 NEUTRONIP=`getent hosts $HOSTNAME | awk '{ print $1 }'`
 KEYSTONEIP=`getent hosts $HOSTNAME | awk '{ print $1 }'`
@@ -50,8 +53,8 @@
                  "do_not_push_flows" : "true",
                  "neutron_server" : "http://$NEUTRONIP:9696/v2.0/",
                  "keystone_server" : "http://$KEYSTONEIP:5000/v2.0/",
-                 "user_name" : "admin",
-                 "password" : "passwd"
+                 "user_name" : "$OS_TENANT_NAME",
+                 "password" : "$OS_PASSWORD"
              }
         }
     }