Reverting trusty-server-multi-nic-docker changes from ceilometer
diff --git a/xos/configurations/common/devstack/local.conf b/xos/configurations/common/devstack/local.conf
index 0c71280..38cd20c 100644
--- a/xos/configurations/common/devstack/local.conf
+++ b/xos/configurations/common/devstack/local.conf
@@ -4,7 +4,8 @@
DOWNLOAD_DEFAULT_IMAGES=false
IMAGE_URLS="http://www.planet-lab.org/cord/trusty-server-multi-nic.img"
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
-enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
+# Append the git branch name if you wish to download ceilometer from a specific branch
+enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
disable_service n-net
enable_service q-svc
@@ -15,5 +16,16 @@
# Optional, to enable tempest configuration as part of devstack
enable_service tempest
+# Uncomment below lines if you are installing kilo version of ceilometer
+#enable_service ceilometer-acentral
+#enable_service ceilometer-anotification
+#enable_service ceilometer-collector
+#enable_service ceilometer-alarm-singleton
+#enable_service ceilometer-alarm-notifier
+#enable_service ceilometer-alarm-evaluator
+#enable_service ceilometer-api
+#enable_service ceilometer-acompute
+CEILOMETER_BACKEND=mongodb
+
## Neutron options
Q_USE_SECGROUP=False
diff --git a/xos/services/ceilometer/models.py b/xos/services/ceilometer/models.py
index 2684097..65bffef 100644
--- a/xos/services/ceilometer/models.py
+++ b/xos/services/ceilometer/models.py
@@ -35,7 +35,7 @@
proxy = True
KIND = CEILOMETER_KIND
- LOOK_FOR_IMAGES=[ "trusty-server-multi-nic-docker", # CloudLab
+ LOOK_FOR_IMAGES=[ #"trusty-server-multi-nic-docker", # CloudLab
"trusty-server-multi-nic",
]
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