Merge lp:~bbaqar/charms/trusty/nova-compute/trunk into lp:~plumgrid-team/charms/trusty/nova-compute/trunk

Proposed by Bilal Baqar
Status: Merged
Merged at revision: 137
Proposed branch: lp:~bbaqar/charms/trusty/nova-compute/trunk
Merge into: lp:~plumgrid-team/charms/trusty/nova-compute/trunk
Diff against target: 47 lines (+15/-0)
3 files modified
templates/icehouse/nova.conf (+5/-0)
templates/juno/nova.conf (+5/-0)
templates/kilo/nova.conf (+5/-0)
To merge this branch: bzr merge lp:~bbaqar/charms/trusty/nova-compute/trunk
Reviewer Review Type Date Requested Status
Bilal Ahmad Approve
Bilal Baqar Approve
Narinder Gupta Approve
Review via email: mp+268682@code.launchpad.net

Description of the change

Enabled neutron security groups for PLUMgrid plugin

To post a comment you must log in.
Revision history for this message
Narinder Gupta (narindergupta) :
review: Approve
Revision history for this message
Bilal Baqar (bbaqar) :
review: Approve
Revision history for this message
Bilal Ahmad (bilalahmad99) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf 2015-04-13 12:22:05 +0000
+++ templates/icehouse/nova.conf 2015-08-21 00:41:38 +0000
@@ -85,6 +85,11 @@
85firewall_driver = nova.virt.firewall.NoopFirewallDriver85firewall_driver = nova.virt.firewall.NoopFirewallDriver
86{% endif -%}86{% endif -%}
8787
88{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
89security_group_api=neutron
90firewall_driver = nova.virt.firewall.NoopFirewallDriver
91{% endif -%}
92
88{% if network_manager_config -%}93{% if network_manager_config -%}
89{% for key, value in network_manager_config.iteritems() -%}94{% for key, value in network_manager_config.iteritems() -%}
90{{ key }} = {{ value }}95{{ key }} = {{ value }}
9196
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf 2015-04-13 12:22:05 +0000
+++ templates/juno/nova.conf 2015-08-21 00:41:38 +0000
@@ -90,6 +90,11 @@
90firewall_driver = nova.virt.firewall.NoopFirewallDriver90firewall_driver = nova.virt.firewall.NoopFirewallDriver
91{% endif -%}91{% endif -%}
9292
93{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
94security_group_api=neutron
95firewall_driver = nova.virt.firewall.NoopFirewallDriver
96{% endif -%}
97
93{% if network_manager_config -%}98{% if network_manager_config -%}
94{% for key, value in network_manager_config.iteritems() -%}99{% for key, value in network_manager_config.iteritems() -%}
95{{ key }} = {{ value }}100{{ key }} = {{ value }}
96101
=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf 2015-04-22 09:21:01 +0000
+++ templates/kilo/nova.conf 2015-08-21 00:41:38 +0000
@@ -72,6 +72,11 @@
72firewall_driver = nova.virt.firewall.NoopFirewallDriver72firewall_driver = nova.virt.firewall.NoopFirewallDriver
73{% endif -%}73{% endif -%}
7474
75{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
76security_group_api=neutron
77firewall_driver = nova.virt.firewall.NoopFirewallDriver
78{% endif -%}
79
75{% if network_manager != 'neutron' and network_manager_config -%}80{% if network_manager != 'neutron' and network_manager_config -%}
76{% for key, value in network_manager_config.iteritems() -%}81{% for key, value in network_manager_config.iteritems() -%}
77{{ key }} = {{ value }}82{{ key }} = {{ value }}

Subscribers

People subscribed via source and target branches