Merge lp:~springfield-team/charms/trusty/nova-cloud-controller/n1kv into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Edward Hope-Morley]

[lp:~springfield-team/charms/trusty/nova-cloud-controller/n1kv]

127. By Shiv Prasad Rao on 2014-11-21

Additional changes for n1kv

128. By Jorge Niedbalski on 2014-11-21

[all] resync with /next && charm helpers "make sync"

129. By Shiv Prasad Rao on 2014-12-08

Changes for n1kv

130. By Edward Hope-Morley on 2014-12-15

[hopem] synced /next

Unmerged revisions

130. By Edward Hope-Morley on 2014-12-15

[hopem] synced /next

129. By Shiv Prasad Rao on 2014-12-08

Changes for n1kv

128. By Jorge Niedbalski on 2014-11-21

[all] resync with /next && charm helpers "make sync"

127. By Shiv Prasad Rao on 2014-11-21

Additional changes for n1kv

126. By Shiv Prasad Rao on 2014-11-18

Cisco Nexus 1000V changes

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-10-13 16:18:58 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-11-21 02:00:54 +0000
@@ -710,7 +710,7 @@
             'vsm_username': config('n1kv-vsm-username'),
             'vsm_password': config('n1kv-vsm-password'),
             'restrict_policy_profiles': config(
-                'n1kv_restrict_policy_profiles'),
+                'n1kv-restrict-policy-profiles'),
         }
 
         return n1kv_ctxt

=== added file 'templates/icehouse/cisco_plugins.ini'
--- templates/icehouse/cisco_plugins.ini	1970-01-01 00:00:00 +0000
+++ templates/icehouse/cisco_plugins.ini	2014-11-21 02:00:54 +0000
@@ -0,0 +1,43 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[cisco_plugins]
+
+[cisco]
+
+[cisco_n1k]
+integration_bridge = br-int
+default_policy_profile = default-pp
+network_node_policy_profile = default-pp
+{% if openstack_release != 'havana' -%}
+http_timeout = 120
+# (BoolOpt) Specify whether plugin should attempt to synchronize with the VSM
+# when neutron is started.
+# Default value: False, indicating no full sync will be performed.
+#
+enable_sync_on_start = False
+{% endif -%}
+restrict_policy_profiles = {{ restrict_policy_profiles }}
+{% if n1kv_user_config_flags -%}
+{% for key, value in n1kv_user_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+[CISCO_PLUGINS]
+vswitch_plugin = neutron.plugins.cisco.n1kv.n1kv_neutron_plugin.N1kvNeutronPluginV2
+
+[N1KV:{{ vsm_ip }}]
+password = {{ vsm_password }}
+username = {{ vsm_username }}
+
+{% include "parts/section-database" %}
+
+[securitygroup]
+{% if neutron_security_groups -%}
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+enable_security_group = True
+{% else -%}
+firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+{% endif -%}

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2014-10-07 11:37:20 +0000
+++ templates/icehouse/nova.conf	2014-11-21 02:00:54 +0000
@@ -76,6 +76,18 @@
 {% endif -%}
 {% endif -%}
 
+{% if neutron_plugin and neutron_plugin == 'n1kv' -%}
+libvirt_user_virtio_for_bridges =  True
+nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% if neutron_security_groups -%}
+security_group_api = {{ network_manager }}
+nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+{% if external_network -%}
+default_floating_pool = {{ external_network }}
+{% endif -%}
+{% endif -%}
+
 {% if network_manager_config -%}
 {% for key, value in network_manager_config.iteritems() -%}
 {{ key }} = {{ value }}

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-10-14 15:17:57 +0000
+++ tests/basic_deployment.py	2014-11-21 02:00:54 +0000
@@ -19,7 +19,7 @@
 class NovaCCBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic nova cloud controller deployment."""
 
-    def __init__(self, series=None, openstack=None, source=None, stable=False):
+    def __init__(self, series=None, openstack=None, source=None, stable=True):
         """Deploy the entire test environment."""
         super(NovaCCBasicDeployment, self).__init__(series, openstack, source, stable)
         self._add_services()