Merge lp:~matthew-dupre/charms/trusty/nova-cloud-controller/juno-nova-security-groups into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Matt Dupre]

Bugfix for OpenStack Juno with Calico networking. See https://bugs.launchpad.net/tpp-metaswitch/+bug/1526100 for original problem.

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://code.launchpad.net/~matthew-dupre/charms/trusty/nova-cloud-controller/juno-nova-security-groups/+merge/282189 against the next branch.)

[Matt Dupre (matthew-dupre)]

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.

[Ryan Beisner (1chb1n)]

It looks like there are merge conflicts. That's not entirely unexpected given that there has been dev momentum in the "next" charm.

Here's what I'd do:

Create a clean checkout of the next charm:
`bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next nova-cloud-controller`

Then make the desired changes against that local branch, commit the changes and push back to lp:~matthew-dupre/charms/trusty/nova-cloud-controller/juno-nova-security-groups with

`bzr push --overwrite`

This merge proposal should refresh and conflicts should be resolved.

That will then trigger some test automation, followed by developer reviews.

Feel free to holler in freenode irc #juju if you need to grab our attention more immediately.

PS. Side note: generally, overwrite should be used with caution as you will lose revision history on the bzr branch in launchpad. But in this case, there is no rev history to preserve on your branch, and it's fewer steps than creating a new proposal.

Thanks again.

review: Needs Resubmitting

[Ryan Beisner (1chb1n)]

Command correction:

`bzr pushlp:~matthew-dupre/charms/trusty/nova-cloud-controller/juno-nova-security-groups --overwrite`

[Ryan Beisner (1chb1n)]

Oh man it's monday? Space between push and lp of course.

[lp:~matthew-dupre/charms/trusty/nova-cloud-controller/juno-nova-security-groups]

210. By Matt Dupre on 2016-01-11

Set Nova security group configuration for Calico on Juno as well

[Matt Dupre (matthew-dupre)]

OK, all done. Thanks.

Unmerged revisions

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-09-17 20:15:37 +0000
+++ templates/juno/nova.conf	2016-01-11 17:48:14 +0000
@@ -84,6 +84,11 @@
 {% endif -%}
 {% endif -%}
 
+{% if neutron_plugin and neutron_plugin == 'Calico' -%}
+security_group_api=neutron
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+
 {% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
 security_group_api=neutron
 firewall_driver = nova.virt.firewall.NoopFirewallDriver