Merge with next

This commit is contained in:
Mick Gregg
2015-11-02 16:40:35 +00:00
37 changed files with 2302 additions and 260 deletions

View File

@@ -92,3 +92,13 @@ options:
create the following public endpoints for ceilometer:
.
https://ceilometer.example.com:8777/
action-managed-upgrade:
type: boolean
default: False
description: |
If True enables openstack upgrades for this charm via juju actions.
You will still need to set openstack-origin to the new repository but
instead of an upgrade running automatically across all units, it will
wait for you to execute the openstack-upgrade action for this charm on
each unit. If False it will revert to existing behavior of upgrading
all units on config change.