Juju Charms Collection
nova-cloud-controller package

Merge lp:~cjohnston/charms/trusty/nova-cloud-controller/ncc-readme-fixes into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

  1. Trusty Tahr (14.04)
  2. ncc-readme-fixes
  3. Merge into next
Proposed by Chris Johnston
Status: Merged
Merge reported by: Billy Olsen
Merged at revision: not available
Proposed branch: lp:~cjohnston/charms/trusty/nova-cloud-controller/ncc-readme-fixes
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 76 lines (+13/-19)
3 files modified
README.md (+11/-17)
config.yaml (+1/-1)
metadata.yaml (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/charms/trusty/nova-cloud-controller/ncc-readme-fixes
Reviewer Review Type Date Requested Status
Billy Olsen Approve
OpenStack Charmers Pending
Review via email: mp+271022@code.launchpad.net

Commit message

Readme fixes, update metadata contain 'tags' instead of 'categories'

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9940 nova-cloud-controller-next for cjohnston mp271022
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12411764/
Build: http://10.245.162.77:8080/job/charm_lint_check/9940/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9158 nova-cloud-controller-next for cjohnston mp271022
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9158/

lp:~cjohnston/charms/trusty/nova-cloud-controller/ncc-readme-fixes updated
188. By Chris Johnston

Rename categories to tags in metadata

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9991 nova-cloud-controller-next for cjohnston mp271022
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9991/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9161 nova-cloud-controller-next for cjohnston mp271022
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9161/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6423 nova-cloud-controller-next for cjohnston mp271022
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12412291/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6423/

Revision history for this message
Billy Olsen (billy-olsen) wrote :

Nit: Can you also move the file from README.txt to README.md since the file is actually in markdown format with this change?

review: Approve
Revision history for this message
Billy Olsen (billy-olsen) :
review: Needs Fixing
Revision history for this message
Billy Olsen (billy-olsen) wrote :

Grr sorry - selected the wrong one, meant needs fixing instead of approved.

lp:~cjohnston/charms/trusty/nova-cloud-controller/ncc-readme-fixes updated
189. By Chris Johnston

Move README to .md per request

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9992 nova-cloud-controller-next for cjohnston mp271022
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9992/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9162 nova-cloud-controller-next for cjohnston mp271022
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9162/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6426 nova-cloud-controller-next for cjohnston mp271022
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12412744/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6426/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6427 nova-cloud-controller-next for cjohnston mp271022
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12413112/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6427/

lp:~cjohnston/charms/trusty/nova-cloud-controller/ncc-readme-fixes updated
190. By Chris Johnston

Typo fixes

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #10064 nova-cloud-controller-next for cjohnston mp271022
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10064/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9230 nova-cloud-controller-next for cjohnston mp271022
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9230/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6450 nova-cloud-controller-next for cjohnston mp271022
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12420499/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6450/

Revision history for this message
Billy Olsen (billy-olsen) wrote :

Thanks for the submission. Minor nit below, but I'll fix it in the merge. Note: ignoring amulet test failures as they are clearly unrelated.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'README.txt' => 'README.md'
--- README.txt 2015-05-12 15:08:59 +0000
+++ README.md 2015-09-15 19:51:31 +0000
@@ -1,8 +1,6 @@
1=====================1# nova-cloud-controller
2nova-cloud-controller
3=====================
42
5Cloud controller node for Openstack nova. Contains nova-schedule, nova-api, nova-network and nova-objectstore.3Cloud controller node for OpenStack nova. Contains nova-schedule, nova-api, nova-network and nova-objectstore.
64
7The neutron-api interface can be used join this charm with an external neutron-api server. If this is done5The neutron-api interface can be used join this charm with an external neutron-api server. If this is done
8then this charm will shutdown its neutron-api service and the external charm will be registered as the6then this charm will shutdown its neutron-api service and the external charm will be registered as the
@@ -14,18 +12,14 @@
14to local. Note: The console access protocol is baked into a guest when it is created, if you change it then12to local. Note: The console access protocol is baked into a guest when it is created, if you change it then
15console access for existing guests will stop working13console access for existing guests will stop working
1614
17******************************************************15**Special considerations to be deployed using Postgresql**
18Special considerations to be deployed using Postgresql16
19******************************************************17 juju deploy nova-cloud-controller
2018 juju deploy postgresql
21juju deploy nova-cloud-controller19 juju add-relation "nova-cloud-controller:pgsql-nova-db" "postgresql:db"
22juju deploy postgresql20 juju add-relation "nova-cloud-controller:pgsql-neutron-db" "postgresql:db"
2321
24juju add-relation "nova-cloud-controller:pgsql-nova-db" "postgresql:db"22## Deploying from source
25juju add-relation "nova-cloud-controller:pgsql-neutron-db" "postgresql:db"
26
27Deploying from source
28=====================
2923
30The minimum openstack-origin-git config required to deploy from source is:24The minimum openstack-origin-git config required to deploy from source is:
3125
@@ -43,7 +37,7 @@
43Note that there are only two 'name' values the charm knows about: 'requirements'37Note that there are only two 'name' values the charm knows about: 'requirements'
44and 'nova'. These repositories must correspond to these 'name' values.38and 'nova'. These repositories must correspond to these 'name' values.
45Additionally, the requirements repository must be specified first and the39Additionally, the requirements repository must be specified first and the
46nova repository must be specified last. All other repostories are installed40nova repository must be specified last. All other repositories are installed
47in the order in which they are specified.41in the order in which they are specified.
4842
49The following is a full list of current tip repos (may not be up-to-date):43The following is a full list of current tip repos (may not be up-to-date):
5044
=== modified file 'config.yaml'
--- config.yaml 2015-07-24 12:29:29 +0000
+++ config.yaml 2015-09-15 19:51:31 +0000
@@ -200,7 +200,7 @@
200 description: |200 description: |
201 SSL certificate to install and use for API ports. Setting this value201 SSL certificate to install and use for API ports. Setting this value
202 and ssl_key will enable reverse proxying, point Nova's entry in the202 and ssl_key will enable reverse proxying, point Nova's entry in the
203 Keystone catalog to use https, and override any certficiate and key203 Keystone catalog to use https, and override any certificiate and key
204 issued by Keystone (if it is configured to do so).204 issued by Keystone (if it is configured to do so).
205 ssl_key:205 ssl_key:
206 type: string206 type: string
207207
=== modified file 'metadata.yaml'
--- metadata.yaml 2015-01-13 09:23:07 +0000
+++ metadata.yaml 2015-09-15 19:51:31 +0000
@@ -4,7 +4,7 @@
4description: |4description: |
5 Cloud controller node for Openstack nova. Contains nova-schedule,5 Cloud controller node for Openstack nova. Contains nova-schedule,
6 nova-api, nova-network and nova-objectstore.6 nova-api, nova-network and nova-objectstore.
7categories:7tags:
8 - openstack8 - openstack
9provides:9provides:
10 nrpe-external-master:10 nrpe-external-master:

Subscribers

People subscribed via source and target branches