Merge lp:~matthew-dupre/charms/trusty/nova-cloud-controller/juno-nova-security-groups into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Status: | Merged |
---|---|
Merged at revision: | 212 |
Proposed branch: | lp:~matthew-dupre/charms/trusty/nova-cloud-controller/juno-nova-security-groups |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next |
Diff against target: |
15 lines (+5/-0) 1 file modified
templates/juno/nova.conf (+5/-0) |
To merge this branch: | bzr merge lp:~matthew-dupre/charms/trusty/nova-cloud-controller/juno-nova-security-groups |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Ryan Beisner | Pending | ||
Review via email: mp+282208@code.launchpad.net |
This proposal supersedes a proposal from 2016-01-11.
Description of the change
Bugfix for OpenStack Juno with Calico networking. See https:/
Calico needs a couple of nova.conf options set, but the stanza to add those options only appeared in the Icehouse and Kilo templates for nova.conf. This merge proposal adds that config to the Juno template as well.
The symptom is that creating VMs with a non-default security group fails (although they can be added later). This happens because Nova is confused about whether it or Neutron is responsible for networking (since the config is missing).
I've tested this myself and it worked.
(This is a resubmission of https:/
I've set this back to "work in progress", because the diff is dramatically larger than it was before!
I'll just rebase the original 5 line change against this branch instead.