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

[Chris Johnston]

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

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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]

188. By Chris Johnston on 2015-09-14

Rename categories to tags in metadata

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[Billy Olsen (billy-olsen)]

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

[Billy Olsen (billy-olsen)]

review: Needs Fixing

[Billy Olsen (billy-olsen)]

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

[lp:~cjohnston/charms/trusty/nova-cloud-controller/ncc-readme-fixes]

189. By Chris Johnston on 2015-09-14

Move README to .md per request

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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]

190. By Chris Johnston on 2015-09-15

Typo fixes

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[Billy Olsen (billy-olsen)]

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

=== 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 @@
-=====================
-nova-cloud-controller
-=====================
+# nova-cloud-controller
 
-Cloud controller node for Openstack nova. Contains nova-schedule, nova-api, nova-network and nova-objectstore.
+Cloud controller node for OpenStack nova. Contains nova-schedule, nova-api, nova-network and nova-objectstore.
 
 The neutron-api interface can be used join this charm with an external neutron-api server. If this is done
 then this charm will shutdown its neutron-api service and the external charm will be registered as the
@@ -14,18 +12,14 @@
 to local. Note: The console access protocol is baked into a guest when it is created, if you change it then
 console access for existing guests will stop working
 
-******************************************************
-Special considerations to be deployed using Postgresql
-******************************************************
-
-juju deploy nova-cloud-controller
-juju deploy postgresql
-
-juju add-relation "nova-cloud-controller:pgsql-nova-db" "postgresql:db"
-juju add-relation "nova-cloud-controller:pgsql-neutron-db" "postgresql:db"
-
-Deploying from source
-=====================
+**Special considerations to be deployed using Postgresql**
+
+    juju deploy nova-cloud-controller
+    juju deploy postgresql
+    juju add-relation "nova-cloud-controller:pgsql-nova-db" "postgresql:db"
+    juju add-relation "nova-cloud-controller:pgsql-neutron-db" "postgresql:db"
+
+## Deploying from source
 
 The minimum openstack-origin-git config required to deploy from source is:
 
@@ -43,7 +37,7 @@
 Note that there are only two 'name' values the charm knows about: 'requirements'
 and 'nova'. These repositories must correspond to these 'name' values.
 Additionally, the requirements repository must be specified first and the
-nova repository must be specified last. All other repostories are installed
+nova repository must be specified last. All other repositories are installed
 in the order in which they are specified.
 
 The following is a full list of current tip repos (may not be up-to-date):

=== 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 @@
     description: |
       SSL certificate to install and use for API ports.  Setting this value
       and ssl_key will enable reverse proxying, point Nova's entry in the
-      Keystone catalog to use https, and override any certficiate and key
+      Keystone catalog to use https, and override any certificiate and key
       issued by Keystone (if it is configured to do so).
   ssl_key:
     type: string

=== 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 @@
 description: |
   Cloud controller node for Openstack nova.  Contains nova-schedule,
   nova-api, nova-network and nova-objectstore.
-categories:
+tags:
   - openstack
 provides:
   nrpe-external-master: