leftovers of trusty-server-multi-nic-docker changes
diff --git a/xos/configurations/common/base.yaml b/xos/configurations/common/base.yaml
index 3f13c94..3638dd9 100644
--- a/xos/configurations/common/base.yaml
+++ b/xos/configurations/common/base.yaml
@@ -20,12 +20,6 @@
disk_format: QCOW2
container_format: BARE
- trusty-server-multi-nic-docker:
- type: tosca.nodes.Image
- properties:
- disk_format: QCOW2
- container_format: BARE
-
MyDeployment:
type: tosca.nodes.Deployment
properties:
@@ -34,9 +28,6 @@
- image:
node: trusty-server-multi-nic
relationship: tosca.relationships.SupportsImage
- - image:
- node: trusty-server-multi-nic-docker
- relationship: tosca.relationships.SupportsImage
CloudLab:
type: tosca.nodes.Controller
diff --git a/xos/configurations/cord/ceilometer.yaml b/xos/configurations/cord/ceilometer.yaml
index f8192fb..6fcd132 100644
--- a/xos/configurations/cord/ceilometer.yaml
+++ b/xos/configurations/cord/ceilometer.yaml
@@ -161,9 +161,6 @@
trusty-server-multi-nic:
type: tosca.nodes.Image
- trusty-server-multi-nic-docker:
- type: tosca.nodes.Image
-
mysite_ceilometer:
description: Ceilometer Proxy Slice
type: tosca.nodes.Slice
@@ -175,7 +172,7 @@
node: mysite
relationship: tosca.relationships.MemberOfSite
- default_image:
- node: trusty-server-multi-nic-docker
+ node: trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
properties:
default_flavor: m1.small
diff --git a/xos/synchronizers/monitoring_channel/templates/start-monitoring-channel.sh.j2 b/xos/synchronizers/monitoring_channel/templates/start-monitoring-channel.sh.j2
index ea5b639..d0e6d87 100755
--- a/xos/synchronizers/monitoring_channel/templates/start-monitoring-channel.sh.j2
+++ b/xos/synchronizers/monitoring_channel/templates/start-monitoring-channel.sh.j2
@@ -40,7 +40,7 @@
#ifconfig $HPC_IFACE 0.0.0.0
# Now copy ceilometer proxy configuration to container
-cat /usr/local/share/monitoring-channel-{{ unique_id }}_ceilometer_proxy_config | docker exec -i $MONITORING_CHANNEL bash -c 'cat > /usr/local/share/ceilometer_proxy_config'
+cat /usr/local/share/monitoring-channel-{{ unique_id }}_ceilometer_proxy_config | sudo docker exec -i $MONITORING_CHANNEL bash -c 'cat > /usr/local/share/ceilometer_proxy_config'
# Attach to container
docker start -a $MONITORING_CHANNEL