lp://qastaging/~hopem/charms/trusty/nova-cloud-controller/pki-token-support
Created by
Edward Hope-Morley
and last modified
- Get this branch:
- bzr branch lp://qastaging/~hopem/charms/trusty/nova-cloud-controller/pki-token-support
Only
Edward Hope-Morley
can upload to this branch. If you are
Edward Hope-Morley
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Merged
into
lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
at
revision 144
- Liam Young (community): Approve
-
Diff: 145 lines (+53/-13)5 files modifiedhooks/charmhelpers/contrib/openstack/context.py (+28/-9)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/nova_cc_utils.py (+9/-3)
templates/icehouse/neutron.conf (+1/-1)
templates/kilo/nova.conf (+1/-0)
Branch information
- Owner:
- Edward Hope-Morley
- Status:
- Development
Recent revisions
- 139. By Edward Hope-Morley
-
[hopem,r=gnuoy]
Ensure that multiple vips are parsed correctly when
running neutron on nova-cloud-controller (legacy mode). Closes-Bug: 1412496
- 137. By Liam Young
-
[hopem, r=gnuoy] Adds nova-alchemy-flags option to allow [database] options
to be set in nova.conf as is currently supported for
neutron.conf.Also changed 'sql_connection' to 'connection' and moved it all into [database] section since that has been the convention since at least Icehouse and is required for other db options.
- 136. By James Page
-
[james-
page,r= gnuoy] Add fallback configuration options for vip cidr and iface for non-standard deployments
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)