Get charm to build

This is still missing the charm.openstack module dependency
2016-05-19 12:15:53 +00:00 · 2016-05-19 12:15:53 +00:00 · eac71d72cd
commit eac71d72cd
parent 4bbf9e0de8
13 changed files with 5 additions and 3 deletions
--- a/5
+++ b/5
@ -1,7 +1,8 @@
 #!/usr/bin/make
+LAYER_PATH := layers

 clean:
-	rm -Rf build
+	rm -Rf build .tox

 generate: clean
-	tox -e generate
+	LAYER_PATH=$(LAYER_PATH) tox -e generate
--- a/charm/config.yaml
+++ b/charm/config.yaml
--- a/charm/hooks/install
+++ b/charm/hooks/install
--- a/charm/hooks/install.real
+++ b/charm/hooks/install.real
--- a/charm/layer.yaml
+++ b/charm/layer.yaml
--- a/charm/lib/charm/openstack/barbican.py
+++ b/charm/lib/charm/openstack/barbican.py
--- a/charm/metadata.yaml
+++ b/charm/metadata.yaml
--- a/charm/reactive/barbican_handlers.py
+++ b/charm/reactive/barbican_handlers.py
--- a/charm/templates/juno/barbican-admin-paste.ini
+++ b/charm/templates/juno/barbican-admin-paste.ini
--- a/charm/templates/juno/barbican-api-paste.ini
+++ b/charm/templates/juno/barbican-api-paste.ini
--- a/charm/templates/juno/barbican-api.conf
+++ b/charm/templates/juno/barbican-api.conf
--- a/requirements.txt
+++ b/requirements.txt
@ -1 +1,2 @@
 charm-tools
+simplejson
--- a/tox.ini
+++ b/tox.ini
@ -18,7 +18,7 @@ deps =
 [testenv:generate]
 basepython = python2.7
 commands =
-    charm build --log-level DEBUG -o {toxinidir}/build barbican
+    charm build --log-level DEBUG -o {toxinidir}/build charm

 [testenv:venv]
 commands = {posargs}