Changed configuration for CORD, frontend and devel
diff --git a/xos/configurations/cord/Makefile b/xos/configurations/cord/Makefile
index 701e92f..a24befa 100644
--- a/xos/configurations/cord/Makefile
+++ b/xos/configurations/cord/Makefile
@@ -5,6 +5,8 @@
cord: common_cloudlab ceilometer_dashboard virtualbng_json
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/
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/frontend/xos_frontend_config b/xos/configurations/cord/xos_cord_config
similarity index 66%
rename from xos/configurations/frontend/xos_frontend_config
rename to xos/configurations/cord/xos_cord_config
index 13fe53b..3085da5 100644
--- a/xos/configurations/frontend/xos_frontend_config
+++ b/xos/configurations/cord/xos_cord_config
@@ -1,4 +1,4 @@
[gui]
branding_name=CORD
-branding_css=/static/cord.css
+#branding_css=/static/cord.css
branding_icon=/static/onos-logo.png
diff --git a/xos/configurations/devel/Makefile b/xos/configurations/devel/Makefile
index 3ce188b..39ce3ac 100644
--- a/xos/configurations/devel/Makefile
+++ b/xos/configurations/devel/Makefile
@@ -5,6 +5,7 @@
test: common_cloudlab
echo "# Autogenerated -- do not edit" > Dockerfile
cat ../common/Dockerfile.common Dockerfile.devel >> Dockerfile
+ cp ../common/xos_common_config ../../xos/xos_configuration/
cd ../../..; sudo docker build -t xos -f xos/configurations/devel/Dockerfile .
sudo docker run -d --add-host="ctl:$(MYIP)" -p 9999:8000 xos
bash ../common/wait_for_xos.sh
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index 884c5da..66f258e 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -9,7 +9,6 @@
sudo apt-get -y install httpie
cat ../common/Dockerfile.common Dockerfile.frontend > Dockerfile
cp ../common/xos_common_config ../../xos/xos_configuration/
- cp ./xos_frontend_config ../../xos/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
@@ -18,7 +17,6 @@
interactive:
cat ../common/Dockerfile.common Dockerfile.frontend > Dockerfile
cp ../common/xos_common_config ../../xos/xos_configuration/
- cp ./xos_frontend_config ../../xos/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