Revert trusty server multi-nic with docker utils 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/steps/sync_monitoringchannel.yaml b/xos/synchronizers/monitoring_channel/steps/sync_monitoringchannel.yaml
index c868be9..06403a6 100644
--- a/xos/synchronizers/monitoring_channel/steps/sync_monitoringchannel.yaml
+++ b/xos/synchronizers/monitoring_channel/steps/sync_monitoringchannel.yaml
@@ -32,24 +32,24 @@
- remove container
{% else %}
{% if full_setup %}
-# - name: Docker repository
-# copy: src=/opt/xos/synchronizers/monitoring_channel/files/docker.list
-# dest=/etc/apt/sources.list.d/docker.list
-#
-# - name: Import the repository key
-# apt_key: keyserver=keyserver.ubuntu.com id=36A1D7869245C8950F966E92D8576A8BA88D21E9
-#
-# - name: install Docker
-# apt: name=lxc-docker state=present update_cache=yes
-#
-# - name: install python-setuptools
-# apt: name=python-setuptools state=present
-#
-# - name: install pip
-# easy_install: name=pip
-#
-# - name: install docker-py
-# pip: name=docker-py version=0.5.3
+ - name: Docker repository
+ copy: src=/opt/xos/synchronizers/monitoring_channel/files/docker.list
+ dest=/etc/apt/sources.list.d/docker.list
+
+ - name: Import the repository key
+ apt_key: keyserver=keyserver.ubuntu.com id=36A1D7869245C8950F966E92D8576A8BA88D21E9
+
+ - name: install Docker
+ apt: name=lxc-docker state=present update_cache=yes
+
+ - name: install python-setuptools
+ apt: name=python-setuptools state=present
+
+ - name: install pip
+ easy_install: name=pip
+
+ - name: install docker-py
+ pip: name=docker-py version=0.5.3
- name: install Pipework
get_url: url=https://raw.githubusercontent.com/jpetazzo/pipework/master/pipework