Juju Charms Collection
nova-compute package

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

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into 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
1=== modified file 'templates/icehouse/nova.conf'
2--- templates/icehouse/nova.conf 2015-04-13 12:22:05 +0000
3+++ templates/icehouse/nova.conf 2015-08-21 00:41:38 +0000
4@@ -85,6 +85,11 @@
5 firewall_driver = nova.virt.firewall.NoopFirewallDriver
6 {% endif -%}
7
8+{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
9+security_group_api=neutron
10+firewall_driver = nova.virt.firewall.NoopFirewallDriver
11+{% endif -%}
12+
13 {% if network_manager_config -%}
14 {% for key, value in network_manager_config.iteritems() -%}
15 {{ key }} = {{ value }}
16
17=== modified file 'templates/juno/nova.conf'
18--- templates/juno/nova.conf 2015-04-13 12:22:05 +0000
19+++ templates/juno/nova.conf 2015-08-21 00:41:38 +0000
20@@ -90,6 +90,11 @@
21 firewall_driver = nova.virt.firewall.NoopFirewallDriver
22 {% endif -%}
23
24+{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
25+security_group_api=neutron
26+firewall_driver = nova.virt.firewall.NoopFirewallDriver
27+{% endif -%}
28+
29 {% if network_manager_config -%}
30 {% for key, value in network_manager_config.iteritems() -%}
31 {{ key }} = {{ value }}
32
33=== modified file 'templates/kilo/nova.conf'
34--- templates/kilo/nova.conf 2015-04-22 09:21:01 +0000
35+++ templates/kilo/nova.conf 2015-08-21 00:41:38 +0000
36@@ -72,6 +72,11 @@
37 firewall_driver = nova.virt.firewall.NoopFirewallDriver
38 {% endif -%}
39
40+{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
41+security_group_api=neutron
42+firewall_driver = nova.virt.firewall.NoopFirewallDriver
43+{% endif -%}
44+
45 {% if network_manager != 'neutron' and network_manager_config -%}
46 {% for key, value in network_manager_config.iteritems() -%}
47 {{ key }} = {{ value }}

Subscribers

People subscribed via source and target branches