Juju Charms Collection
nova-cloud-controller package

Merge lp:~tvansteenburgh/charms/trusty/nova-cloud-controller/fix-tests into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk

  1. Trusty Tahr (14.04)
  2. fix-tests
  3. Merge into trunk
Proposed by Tim Van Steenburgh
Status: Merged
Merged at revision: 82
Proposed branch: lp:~tvansteenburgh/charms/trusty/nova-cloud-controller/fix-tests
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk
Diff against target: 82 lines (+17/-2)
2 files modified
Makefile (+10/-2)
config.yaml (+7/-0)
To merge this branch: bzr merge lp:~tvansteenburgh/charms/trusty/nova-cloud-controller/fix-tests
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+234031@code.launchpad.net

Description of the change

Fix tests, proof errors.

To post a comment you must log in.

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:53:46 +0000
3+++ Makefile 2014-09-09 23:46:45 +0000
4@@ -5,9 +5,9 @@
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 bin/charm_helpers_sync.py:
15 @mkdir -p bin
16@@ -20,3 +20,11 @@
17 publish: lint test
18 bzr push lp:charms/nova-cloud-controller
19 bzr push lp:charms/trusty/nova-cloud-controller
20+
21+.venv:
22+ sudo apt-get install python-virtualenv python-apt
23+ virtualenv .venv --system-site-packages
24+ .venv/bin/pip install -I nose mock pyyaml
25+
26+clean:
27+ rm -rf .venv
28
29=== modified file 'config.yaml'
30--- config.yaml 2014-07-29 15:05:01 +0000
31+++ config.yaml 2014-09-09 23:46:45 +0000
32@@ -97,6 +97,7 @@
33 # HA configuration settings
34 vip:
35 type: string
36+ default:
37 description: "Virtual IP to use to front API services in ha configuration"
38 vip_iface:
39 type: string
40@@ -120,6 +121,7 @@
41 HA Cluster nodes.
42 ssl_cert:
43 type: string
44+ default:
45 description: |
46 SSL certificate to install and use for API ports. Setting this value
47 and ssl_key will enable reverse proxying, point Nova's entry in the
48@@ -127,9 +129,11 @@
49 issued by Keystone (if it is configured to do so).
50 ssl_key:
51 type: string
52+ default:
53 description: SSL key to use with certificate specified as ssl_cert.
54 ssl_ca:
55 type: string
56+ default:
57 description: |
58 SSL CA to use with the certificate and key provided - this is only
59 required if you are providing a privately signed ssl_cert and ssl_key.
60@@ -141,6 +145,7 @@
61 # Neutron NVP and VMware NSX plugin configuration
62 nvp-controllers:
63 type: string
64+ default:
65 description: Space delimited addresses of NVP/NSX controllers
66 nvp-username:
67 type: string
68@@ -156,12 +161,14 @@
69 description: Name of the NVP cluster configuration to create (grizzly only)
70 nvp-tz-uuid:
71 type: string
72+ default:
73 description: |
74 This is uuid of the default NVP/NSX Transport zone that will be used for
75 creating tunneled isolated Quantum networks. It needs to be created
76 in NVP before starting Quantum with the nvp plugin.
77 nvp-l3-uuid:
78 type: string
79+ default:
80 description: |
81 This is uuid of the default NVP/NSX L3 Gateway Service.
82 # end of NVP/NSX configuration

Subscribers

People subscribed via source and target branches