Merge "Update readme and clean up stray ide files"

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ceilometer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>

.pydevproject

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/ceilometer/hooks</path>
-<path>/ceilometer/unit_tests</path>
-</pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-</pydev_project>

README.md

@@ -1,19 +1,12 @@
 Overview
 --------
 
-This charm provides the Ceilometer service for OpenStack.  It is intended to
-be used alongside the other OpenStack components, starting with the Folsom
-release.
+This charm provides the Ceilometer service for OpenStack.
 
 Ceilometer is made up of 2 separate services: an API service, and a collector
 service. This charm allows them to be deployed in different combination,
 depending on user preference and requirements.
 
-This charm was developed to support deploying Folsom on both Ubuntu Quantal
-and Ubuntu Precise.  Since Ceilometer is only available for Ubuntu 12.04 via
-the Ubuntu Cloud Archive, deploying this charm to a Precise machine will by
-default install Ceilometer and its dependencies from the Cloud Archive.
-
 Usage
 -----
 
@@ -52,6 +45,7 @@ installed in each nova node, and be related with Ceilometer service:
 
     juju deploy ceilometer-agent
     juju add-relation ceilometer-agent nova-compute
+    juju add-relation ceilometer-agent:amqp rabbitmq-server:amqp
     juju add-relation ceilometer:ceilometer-service ceilometer-agent:ceilometer-service
 
 Ceilometer provides an API service that can be used to retrieve
@@ -113,7 +107,7 @@ To use this feature, use the --bind option when deploying the charm:
 alternatively these can also be provided as part of a juju native bundle configuration:
 
     ceilometer:
-      charm: cs:xenial/ceilometer
+      charm: cs:ceilometer
       bindings:
         public: public-space
         admin: admin-space

revision

@@ -1 +0,0 @@
-44

setup.cfg

@@ -1,6 +0,0 @@
-[nosetests]
-verbosity=2
-with-coverage=1
-cover-erase=1
-cover-package=hooks
-