Juju Charms Collection
cinder package

Merge lp:~tvansteenburgh/charms/precise/cinder/fix-tests into lp:~openstack-charmers-archive/charms/precise/cinder/trunk

  1. Precise Pangolin (12.04)
  2. fix-tests
  3. Merge into trunk
Proposed by Tim Van Steenburgh
Status: Merged
Merged at revision: 39
Proposed branch: lp:~tvansteenburgh/charms/precise/cinder/fix-tests
Merge into: lp:~openstack-charmers-archive/charms/precise/cinder/trunk
Diff against target: 64 lines (+15/-2)
2 files modified
Makefile (+10/-2)
config.yaml (+5/-0)
To merge this branch: bzr merge lp:~tvansteenburgh/charms/precise/cinder/fix-tests
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+234185@code.launchpad.net

Description of the change

Fix tests, proof.

To post a comment you must log in.
Revision history for this message
Charles Butler (lazypower) wrote :

+1 LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2014-05-21 10:11:37 +0000
3+++ Makefile 2014-09-10 19:06:50 +0000
4@@ -5,9 +5,14 @@
5 @flake8 --exclude hooks/charmhelpers hooks unit_tests
6 @charm proof
7
8-test:
9+test: .venv
10 @echo Starting tests...
11- @$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
12+ .venv/bin/nosetests --nologcapture unit_tests
13+
14+.venv:
15+ sudo apt-get install python-virtualenv python-apt
16+ virtualenv .venv --system-site-packages
17+ .venv/bin/pip install -I nose
18
19 sync:
20 @charm-helper-sync -c charm-helpers.yaml
21@@ -15,3 +20,6 @@
22 publish: lint test
23 bzr push lp:charms/cinder
24 bzr push lp:charms/trusty/cinder
25+
26+clean:
27+ rm -rf .venv
28
29=== modified file 'config.yaml'
30--- config.yaml 2014-04-12 19:12:09 +0000
31+++ config.yaml 2014-09-10 19:06:50 +0000
32@@ -101,6 +101,7 @@
33 description: Enable verbose logging
34 # HA configuration settings
35 vip:
36+ default:
37 type: string
38 description: "Virtual IP to use to front cinder API in ha configuration"
39 vip_iface:
40@@ -125,6 +126,7 @@
41 HA Cluster nodes.
42 # Per-service HTTPS configuration.
43 ssl_cert:
44+ default:
45 type: string
46 description: |
47 SSL certificate to install and use for API ports. Setting this value
48@@ -132,14 +134,17 @@
49 Keystone catalog to use https, and override any certficiate and key
50 issued by Keystone (if it is configured to do so).
51 ssl_key:
52+ default:
53 type: string
54 description: SSL key to use with certificate specified as ssl_cert.
55 ssl_ca:
56+ default:
57 type: string
58 description: |
59 SSL CA to use with the certificate and key provided - this is only
60 required if you are providing a privately signed ssl_cert and ssl_key.
61 config-flags:
62+ default:
63 type: string
64 description: Comma separated list of key=value config flags to be set in cinder.conf.
65

Subscribers

People subscribed via source and target branches