Merge branch 'xos_auto_scaling_app_changes' of https://github.com/open-cloud/xos into xos_auto_scaling_app_changes
diff --git a/xos/configurations/cord/Makefile b/xos/configurations/cord/Makefile
index 80b71e0..9c11927 100644
--- a/xos/configurations/cord/Makefile
+++ b/xos/configurations/cord/Makefile
@@ -18,7 +18,7 @@
ceilometer_dashboard:
#NOTE: The below dashboard install scripts assume
#clouldlab openstack environment created using "OpenStack" profile
- bash install_xos_ceilometer_dashboard.sh
+ #bash install_xos_ceilometer_dashboard.sh
bash install_ceilometer_patch.sh
virtualbng_json:
diff --git a/xos/configurations/cord/Makefile.inside b/xos/configurations/cord/Makefile.inside
index b8e23f8..1d905c9 100644
--- a/xos/configurations/cord/Makefile.inside
+++ b/xos/configurations/cord/Makefile.inside
@@ -6,6 +6,7 @@
python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/cloudlab.yaml
python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/cloudlab-nodes.yaml
python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/cord/cord.yaml
+ python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/tosca/samples/helloworld-chain.yaml
python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/cord/ceilometer.yaml
run_develserver:
diff --git a/xos/configurations/cord/cord.yaml b/xos/configurations/cord/cord.yaml
index 8aa4676..de2075f 100644
--- a/xos/configurations/cord/cord.yaml
+++ b/xos/configurations/cord/cord.yaml
@@ -265,7 +265,7 @@
node: docker-vcpe
relationship: tosca.relationships.UsesImage
properties:
- default_isolation: container
+ default_isolation: vm
mysite_onos_vbng:
description: ONOS Controller Slice for vBNG