move configuration dir up one level
diff --git a/xos/configurations/cord/Makefile b/xos/configurations/cord/Makefile
index 7714d2a..ef823cd 100644
--- a/xos/configurations/cord/Makefile
+++ b/xos/configurations/cord/Makefile
@@ -3,11 +3,11 @@
LAST_CONTAINER=$(shell sudo docker ps -l -q)
cord: common_cloudlab ceilometer_dashboard virtualbng_json
- rm ../../xos/xos_configuration/*
+ rm ../../xos_configuration/*
echo "# Autogenerated -- do not edit" > Dockerfile
cat ../common/Dockerfile.common Dockerfile.cord >> Dockerfile
- cp ../common/xos_common_config ../../xos/xos_configuration/
- cp ./xos_cord_config ../../xos/xos_configuration/
+ cp ../common/xos_common_config ../../xos_configuration/
+ cp ./xos_cord_config ../../xos_configuration/
cd ../../..; sudo docker build -t xos -f xos/configurations/cord/Dockerfile .
sudo docker run -d --add-host="ctl:$(MYIP)" -p 9999:8000 xos
bash ../common/wait_for_xos.sh
diff --git a/xos/configurations/devel/Makefile b/xos/configurations/devel/Makefile
index f95c4e3..216673d 100644
--- a/xos/configurations/devel/Makefile
+++ b/xos/configurations/devel/Makefile
@@ -7,8 +7,8 @@
devstack: common_devstack xos
xos:
- rm ../../xos/xos_configuration/*
- cp ../common/xos_common_config ../../xos/xos_configuration/
+ rm ../../xos_configuration/*
+ cp ../common/xos_common_config ../../xos_configuration/
echo "# Autogenerated -- do not edit" > Dockerfile
cat ../common/Dockerfile.common Dockerfile.devel >> Dockerfile
cd ../../..; sudo docker build -t xosproject/xos-devel -f xos/configurations/devel/Dockerfile .
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index ae1dbce..e30877a 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -6,20 +6,20 @@
all: frontend
frontend:
- rm ../../xos/xos_configuration/*
+ rm ../../xos_configuration/*
sudo apt-get -y install httpie
cat ../common/Dockerfile.common Dockerfile.frontend > Dockerfile
- cp ../common/xos_common_config ../../xos/xos_configuration/
+ cp ../common/xos_common_config ../../xos_configuration/
cd ../../..; sudo docker build -t xos -f xos/configurations/frontend/Dockerfile .
sudo docker run -v $(XOS_FOLDER)/../../core/xoslib:/opt/xos/core/xoslib -p 9999:8000 --add-host="0.0.0.0:127.0.0.1" xos
bash ../common/wait_for_xos.sh
echo $(RUNNING_CONTAINER)
interactive:
- rm ../../xos/xos_configuration/*
+ rm ../../xos_configuration/*
cat ../common/Dockerfile.common Dockerfile.frontend > Dockerfile
- cp ../common/xos_common_config ../../xos/xos_configuration/
- #cp ../cord/xos_cord_config ../../xos/xos_configuration/
+ cp ../common/xos_common_config ../../xos_configuration/
+ #cp ../cord/xos_cord_config ../../xos_configuration/
cd ../../..; sudo docker build -t xos -f xos/configurations/frontend/Dockerfile .
echo "Inside the container run: /usr/bin/make -C /opt/xos/configurations/frontend -f Makefile.inside"
sudo docker run -it -v $(shell pwd)/../..:/opt/xos -p 9999:8000 --add-host="0.0.0.0:127.0.0.1" xos
diff --git a/xos/xos/config.py b/xos/xos/config.py
index ab78fa1..7a64de9 100644
--- a/xos/xos/config.py
+++ b/xos/xos/config.py
@@ -13,7 +13,7 @@
"""
XOS_DIR = "/opt/xos"
-DEFAULT_CONFIG_FN = os.path.join(XOS_DIR, "xos/xos_configuration/")
+DEFAULT_CONFIG_FN = os.path.join(XOS_DIR, "xos_configuration/")
# warning for now, remove once we're sure everyone has made the change
if (os.path.exists("/opt/planetstack/plstackapi_config") and (not os.path.exists(DEFAULT_CONFIG_FN))):
@@ -82,7 +82,7 @@
try:
if os.path.isdir(filename):
config_list = list(reversed(os.listdir(filename)))
- config_list = [DEFAULT_CONFIG_FN + s for s in config_list]
+ config_list = [os.path.join(filename, s) for s in config_list]
self.config.read(config_list)
else:
self.config.read(filename)
diff --git a/xos/xos/xos_configuration/xos_common_config b/xos/xos_configuration/xos_common_config
similarity index 100%
rename from xos/xos/xos_configuration/xos_common_config
rename to xos/xos_configuration/xos_common_config
diff --git a/xos/xos/xos_configuration/xos_frontend_config b/xos/xos_configuration/xos_frontend_config
similarity index 100%
rename from xos/xos/xos_configuration/xos_frontend_config
rename to xos/xos_configuration/xos_frontend_config