Fixed a couple of bugs
diff --git a/xos/configurations/common/Makefile.devstack b/xos/configurations/common/Makefile.devstack
index 2764b28..6ec284f 100644
--- a/xos/configurations/common/Makefile.devstack
+++ b/xos/configurations/common/Makefile.devstack
@@ -15,10 +15,10 @@
flat_name:
echo private|tr -d '\n' > $(SETUPDIR)/flat_net_name
- bash -c "source admin-openrc.sh; openstack network set --share private"
+ bash -c "source $(SETUPDIR)/admin-openrc.sh; openstack network set --share private"
nodes_yaml:
- bash ./make-nodes-yaml.sh > $(SETUPDIR)/nodes.yaml
+ export SETUPDIR=$(SETUPDIR); bash ./make-nodes-yaml.sh
ceilometer_url:
echo http://`hostname -i`/xosmetering/ > $(SETUPDIR)/ceilometer_url
@@ -38,4 +38,4 @@
net_fix:
sudo devstack/net-fix.sh
- bash -c "source admin-openrc.sh; neutron subnet-update private-subnet --dns-nameservers list=true 8.8.8.8 8.8.4.4"
+ bash -c "source $(SETUPDIR)/admin-openrc.sh; neutron subnet-update private-subnet --dns-nameservers list=true 8.8.8.8 8.8.4.4"