Merge lp:~johnsca/charms/trusty/neutron-calico/review into lp:~project-calico/charms/trusty/neutron-calico/trunk

[Cory Johns]

Fixed README and testdep target

[lp:~johnsca/charms/trusty/neutron-calico/review]

65. By Cory Johns on 2015-11-06

Fixed charm proof warning

[Matt Dupre (matthew-dupre)]

Looks good to me.

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-03-12 16:11:07 +0000
+++ Makefile	2015-11-06 16:28:49 +0000
@@ -7,7 +7,7 @@
 	@charm proof
 
 testdep:
-	@sudo apt-get install -q -y python-nose python-mock python-netaddr python-netifaces
+	@sudo apt-get install -q -y python-nose python-mock python-netaddr python-netifaces python-jinja2
 
 test: testdep
 	@echo Starting tests...
 
=== modified file 'README.md'
--- README.md	2015-08-28 08:03:17 +0000
+++ README.md	2015-11-06 16:28:49 +0000
@@ -11,14 +11,14 @@
 To deploy (partial deployment of linked charms only):
 
     juju deploy rabbitmq-server
-    juju deploy cs:~project-calico/neutron-api
+    juju deploy neutron-api
     juju deploy nova-compute
     juju deploy cs:~kubernetes/etcd
     juju deploy cs:~project-calico/neutron-calico
     juju add-relation neutron-calico nova-compute
     juju add-relation neutron-calico neutron-api
     juju add-relation neutron-calico rabbitmq-server
-    juju add-relation neutron-calico etcd:etcd-peer
+    juju add-relation neutron-calico etcd
 
 When deploying at scale, you should optionally add a BGP route reflector:
 
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-06-19 08:17:39 +0000
+++ metadata.yaml	2015-11-06 16:28:49 +0000
@@ -14,7 +14,7 @@
   .
   This charm provides the OpenStack Neutron Calico Agent, managing
   L3 connectivity on nova-compute services.
-categories:
+tags:
   - openstack
 provides:
   neutron-plugin: