Merge branch 'master' of https://github.com/xmaruto/mcord
diff --git a/containers/Makefile b/containers/Makefile
index 92685e7..556332c 100644
--- a/containers/Makefile
+++ b/containers/Makefile
@@ -5,6 +5,7 @@
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/setup.yaml
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 exec frontend_xos_1 cp /opt/xos/configurations/cord/xos_cord_config /opt/xos/xos_configuration/
nodes.yaml:
export SETUPDIR=.; bash ../xos/configurations/common/make-nodes-yaml.sh
diff --git a/xos/core/static/mcord-bg2.jpg b/xos/core/static/mcord-bg2.jpg
index 1dde1b2..e378fda 100644
--- a/xos/core/static/mcord-bg2.jpg
+++ b/xos/core/static/mcord-bg2.jpg
Binary files differ
diff --git a/xos/core/static/mcord-bg2bk.jpg b/xos/core/static/mcord-bg2bk.jpg
new file mode 100644
index 0000000..1dde1b2
--- /dev/null
+++ b/xos/core/static/mcord-bg2bk.jpg
Binary files differ
diff --git a/xos/tosca/MCORDServiceN.yaml b/xos/tosca/MCORDServiceN.yaml
index baf1582..25a9049 100644
--- a/xos/tosca/MCORDServiceN.yaml
+++ b/xos/tosca/MCORDServiceN.yaml
@@ -35,20 +35,20 @@
node: trusty-server-multi-nic
relationship: tosca.relationships.SupportsImage
- CloudLab:
- type: tosca.nodes.Controller
- requirements:
- - deployment:
- node: MyDeployment
- relationship: tosca.relationships.ControllerDeployment
- properties:
- backend_type: OpenStack
- version: Juno
- auth_url: http://sample/v2
- admin_user: admin
- admin_password: adminpassword
- admin_tenant: admin
- domain: Default
+ # CloudLab:
+ # type: tosca.nodes.Controller
+ # requirements:
+ # - deployment:
+ # node: MyDeployment
+ # relationship: tosca.relationships.ControllerDeployment
+ # properties:
+ # backend_type: OpenStack
+ # version: Juno
+ # auth_url: http://sample/v2
+ # admin_user: admin
+ # admin_password: adminpassword
+ # admin_tenant: admin
+ # domain: Default
mysite:
type: tosca.nodes.Site
@@ -59,10 +59,10 @@
- deployment:
node: MyDeployment
relationship: tosca.relationships.SiteDeployment
- requirements:
- - controller:
- node: CloudLab
- relationship: tosca.relationships.UsesController
+ # requirements:
+ # - controller:
+ # node: CloudLab
+ # relationship: tosca.relationships.UsesController
compute9:
type: tosca.nodes.Node
