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

Proposed by Tim Van Steenburgh
Status: Merged
Merged at revision: 75
Proposed branch: lp:~tvansteenburgh/charms/precise/nova-compute/fix-tests
Merge into: lp:~openstack-charmers-archive/charms/precise/nova-compute/trunk
Diff against target: 59 lines (+23/-2)
3 files modified
Makefile (+10/-2)
README.txt (+11/-0)
config.yaml (+2/-0)
To merge this branch: bzr merge lp:~tvansteenburgh/charms/precise/nova-compute/fix-tests
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+234229@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 - merging to resolve CI Report

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-08-13 15:55:07 +0000
3+++ Makefile 2014-09-10 23:18:51 +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 --with-coverage unit_tests
12+ .venv/bin/nosetests --nologcapture --with-coverage unit_tests
13+
14+.venv:
15+ sudo apt-get install -y python-virtualenv python-apt
16+ virtualenv .venv --system-site-packages
17+ .venv/bin/pip install -I nose
18
19 bin/charm_helpers_sync.py:
20 @mkdir -p bin
21@@ -20,3 +25,6 @@
22 publish: lint test
23 bzr push lp:charms/nova-compute
24 bzr push lp:charms/trusty/nova-compute
25+
26+clean:
27+ rm -rf .venv/ .coverage
28
29=== added file 'README.txt'
30--- README.txt 1970-01-01 00:00:00 +0000
31+++ README.txt 2014-09-10 23:18:51 +0000
32@@ -0,0 +1,11 @@
33+============
34+nova-compute
35+============
36+
37+Compute node for Openstack nova.
38+
39+OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
40+addition to its "native" API (the OpenStack API), it also supports the Amazon
41+EC2 API.
42+
43+Maintainer: Adam Gandelman <adamg@canonical.com>
44
45=== modified file 'config.yaml'
46--- config.yaml 2014-09-02 15:25:14 +0000
47+++ config.yaml 2014-09-10 23:18:51 +0000
48@@ -92,9 +92,11 @@
49 instances-path:
50 type: string
51 description: Instance path to use - empty means default of /var/lib/nova/instances
52+ default:
53 config-flags:
54 type: string
55 description: Comma separated list of key=value config flags to be set in nova.conf.
56+ default:
57 nagios_context:
58 default: "juju"
59 type: string

Subscribers

People subscribed via source and target branches