Moved m-cord detail from common to mcord config
diff --git a/xos/configurations/common/xos_common_config b/xos/configurations/common/xos_common_config
index b2e102f..f7f5784 100755
--- a/xos/configurations/common/xos_common_config
+++ b/xos/configurations/common/xos_common_config
@@ -43,11 +43,10 @@
[gui]
disable_minidashboard=True
-branding_name=M-CORD
-branding_icon=/static/cord-logo.png
-branding_favicon=/static/cord-favicon.png
-branding_bg=/static/mcord-bg2.jpg
-service_view_class=core.views.mCordServiceGrid.ServiceGridView
+branding_name=Open Cloud
+branding_icon=/static/logo.png
+branding_favicon=/static/favicon.png
+branding_bg=/static/bg.jpg
[networking]
use_vtn=True
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index e65067b..d2a1d5c 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -4,7 +4,7 @@
sudo make -f ../common/Makefile.prereqs
sudo docker-compose up -d
bash ../common/wait_for_xos.sh
- bash ../mcord/xos/initdb
+ # bash ../mcord/xos/initdb
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/frontend/sample.yaml
# sudo docker-compose run xos python manage.py makemigrations mcordservice
# sudo docker-compose run xos python manage.py syncdb
@@ -37,5 +37,5 @@
mock-mcord:
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/fixtures.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/frontend/mocks/mcord.yaml
- sudo docker exec frontend_xos_1 cp /opt/xos/configurations/frontend/mocks/xos_mcord_config /opt/xos/xos_configuration/
+ sudo docker exec frontend_xos_1 cp /opt/xos/configurations/mcord/xos_mcord_config /opt/xos/xos_configuration/
sudo docker exec frontend_xos_1 touch /opt/xos/xos/settings.py
diff --git a/xos/configurations/mcord/Makefile b/xos/configurations/mcord/Makefile
index 9c977bf..9be6f10 100644
--- a/xos/configurations/mcord/Makefile
+++ b/xos/configurations/mcord/Makefile
@@ -7,7 +7,7 @@
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/images.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/mgmt-net.yaml
- sudo docker exec mcord_xos_1 cp /opt/xos/configurations/frontend/mocks/xos_mcord_config /opt/xos/xos_configuration/
+ sudo docker exec mcord_xos_1 cp /opt/xos/configurations/mcord/xos_mcord_config /opt/xos/xos_configuration/
sudo docker exec mcord_xos_1 touch /opt/xos/xos/settings.py
nodes.yaml:
diff --git a/xos/configurations/frontend/mocks/xos_mcord_config b/xos/configurations/mcord/xos_mcord_config
similarity index 100%
rename from xos/configurations/frontend/mocks/xos_mcord_config
rename to xos/configurations/mcord/xos_mcord_config