Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/configurations/devel/Makefile b/xos/configurations/devel/Makefile
index 2cebad8..5d2e96f 100644
--- a/xos/configurations/devel/Makefile
+++ b/xos/configurations/devel/Makefile
@@ -1,8 +1,8 @@
MYIP:=$(shell hostname -i)
-cloudlab: common_cloudlab containers xos
+cloudlab: common_cloudlab local_containers xos
-devstack: upgrade_pkgs common_devstack containers xos
+devstack: upgrade_pkgs common_devstack local_containers xos
xos:
sudo MYIP=$(MYIP) docker-compose up -d
@@ -12,6 +12,12 @@
sudo MYIP=$(MYIP) docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/cloudlab-openstack.yaml
sudo MYIP=$(MYIP) docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
+common_cloudlab:
+ make -C ../common -f Makefile.cloudlab
+
+common_devstack:
+ make -C ../common -f Makefile.devstack
+
base:
make -C ../../../containers/xos base
@@ -25,12 +31,6 @@
make -C ../../../containers/xos devel
make -C ../../../containers/synchronizer
-common_cloudlab:
- make -C ../common -f Makefile.cloudlab
-
-common_devstack:
- make -C ../common -f Makefile.devstack
-
stop:
sudo MYIP=$(MYIP) docker-compose stop