Auto scaling fixes2
diff --git a/xos/configurations/cord/Makefile.inside b/xos/configurations/cord/Makefile.inside
index 1d905c9..b8e23f8 100644
--- a/xos/configurations/cord/Makefile.inside
+++ b/xos/configurations/cord/Makefile.inside
@@ -6,7 +6,6 @@
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 de2075f..8aa4676 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: vm
+ default_isolation: container
mysite_onos_vbng:
description: ONOS Controller Slice for vBNG
diff --git a/xos/configurations/cord/install_xos_ceilometer_dashboard.sh b/xos/configurations/cord/install_xos_ceilometer_dashboard.sh
deleted file mode 100755
index ed72f54..0000000
--- a/xos/configurations/cord/install_xos_ceilometer_dashboard.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-if [ -d /usr/share/xos-metering ]; then
- echo "Seems xos ceilometer dashboard is already installed... so exiting gracefully..."
- exit 0
-fi
-echo "Verifying if all the required files are present"
-if [ ! -f xos_metering_dashboard.tar.gz ];
-then
- echo "File xos_metering_dashboard.tar.gz not found"
- exit 1
-fi
-if [ ! -f etc_xos_metering.tar.gz ];
-then
- echo "File etc_xos_metering.tar.gz not found"
- exit 1
-fi
-echo "Copying the xos ceilometer dashboard files /usr/share/ and /etc/apache2/"
-tar -xzf xos_metering_dashboard.tar.gz
-sudo mv xos-metering /usr/share/
-tar -xzf etc_xos_metering.tar.gz
-sudo mv xos-metering /etc/
-sudo mv apache2/conf-available/xos-metering.conf /etc/apache2/conf-available/
-cd /etc/apache2/conf-enabled/
-sudo ln -s ../conf-available/xos-metering.conf xos-metering.conf
-echo "Restarting apache2"
-sudo service apache2 restart
diff --git a/xos/configurations/cord/xos_metering_dashboard.tar.gz b/xos/configurations/cord/xos_metering_dashboard.tar.gz
deleted file mode 100644
index 3b4d127..0000000
--- a/xos/configurations/cord/xos_metering_dashboard.tar.gz
+++ /dev/null
Binary files differ