From f9e489c86cd89bfe69783037944e285b3bcb51a6 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 24 Jun 2014 17:19:15 +0000
Subject: [PATCH] Move charm-helpers.yaml to charm-helpers-hooks.yaml and add
 charm-helpers-tests.yaml.

---
 Makefile                                       | 3 ++-
 charm-helpers.yaml => charm-helpers-hooks.yaml | 0
 charm-helpers-tests.yaml                       | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 rename charm-helpers.yaml => charm-helpers-hooks.yaml (100%)
 create mode 100644 charm-helpers-tests.yaml

diff --git a/Makefile b/Makefile
index 2ec849dc..7d92e615 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,8 @@ test:
 	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  unit_tests
 
 sync:
-	@charm-helper-sync -c charm-helpers.yaml
+	@charm-helper-sync -c charm-helpers-hooks.yaml
+	@charm-helper-sync -c charm-helpers-tests.yaml
 
 publish: lint test
 	bzr push lp:charms/nova-cloud-controller
diff --git a/charm-helpers.yaml b/charm-helpers-hooks.yaml
similarity index 100%
rename from charm-helpers.yaml
rename to charm-helpers-hooks.yaml
diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml
new file mode 100644
index 00000000..48b12f6f
--- /dev/null
+++ b/charm-helpers-tests.yaml
@@ -0,0 +1,5 @@
+branch: lp:charm-helpers
+destination: tests/charmhelpers
+include:
+    - contrib.amulet
+    - contrib.openstack.amulet