Merge lp:~james-page/charms/precise/nova-cloud-controller/nsx-update into lp:~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk

[James Page]

Fixup NSX support in Icehouse

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-04-16 08:47:14 +0000
+++ config.yaml	2014-06-17 10:08:23 +0000
@@ -69,10 +69,12 @@
       Quantum plugin to use for network management; supports
       .
         ovs - OpenvSwitch Plugin
-        nvp - Nicira Network Virtualization Platform
+        nvp|nsx - Nicira Network Virtualization Platform/
+                  VMware NSX Network Virtualization Platform
+                  (renamed for Icehouse)
       .
       This configuration only has context when used with
-      network-manager Quantum.
+      network-manager Quantum|Neutron.
   quantum-security-groups:
     type: string
     default: "no"
@@ -136,18 +138,18 @@
     default: False
     description: |
       If set to True, supporting services will log to syslog.
-  # Neutron NVP Plugin configuration
+  # Neutron NVP and VMware NSX plugin configuration
   nvp-controllers:
     type: string
-    description: Space delimited addresses of NVP controllers
+    description: Space delimited addresses of NVP/NSX controllers
   nvp-username:
     type: string
     default: admin
-    description: Username to connect to NVP controllers with
+    description: Username to connect to NVP/NSX controllers with
   nvp-password:
     type: string
     default: admin
-    description: Password to connect to NVP controllers with
+    description: Password to connect to NVP/NSX controllers with
   nvp-cluster-name:
     type: string
     default: example
@@ -155,12 +157,11 @@
   nvp-tz-uuid:
     type: string
     description: |
-      This is uuid of the default NVP Transport zone that will be used for
+      This is uuid of the default NVP/NSX Transport zone that will be used for
       creating tunneled isolated Quantum networks.  It needs to be created
       in NVP before starting Quantum with the nvp plugin.
   nvp-l3-uuid:
     type: string
     description: |
-      This is uuid of the default NVP L3 Gateway Service.
-  # end of NVP configuration
-
+      This is uuid of the default NVP/NSX L3 Gateway Service.
+  # end of NVP/NSX configuration

=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2014-04-12 21:25:19 +0000
+++ hooks/nova_cc_context.py	2014-06-17 10:08:23 +0000
@@ -161,7 +161,7 @@
     def __call__(self):
         ctxt = super(NeutronCCContext, self).__call__()
         ctxt['external_network'] = config('neutron-external-network')
-        if 'nvp' in [config('quantum-plugin'), config('neutron-plugin')]:
+        if config('quantum-plugin') in ['nvp', 'nsx']:
             _config = config()
             for k, v in _config.iteritems():
                 if k.startswith('nvp'):

=== modified file 'templates/icehouse/neutron.conf'
--- templates/icehouse/neutron.conf	2014-04-09 07:58:21 +0000
+++ templates/icehouse/neutron.conf	2014-06-17 10:08:23 +0000
@@ -68,4 +68,4 @@
 [service_providers]
 service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
 service_provider=VPN:openswan:neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
-service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default
\ No newline at end of file
+service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default

=== added file 'templates/icehouse/nsx.ini'
--- templates/icehouse/nsx.ini	1970-01-01 00:00:00 +0000
+++ templates/icehouse/nsx.ini	2014-06-17 10:08:23 +0000
@@ -0,0 +1,11 @@
+# icehouse
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+nsx_user = {{ nvp_username }}
+nsx_password = {{ nvp_password }}
+nsx_controllers = {{ nvp_controllers }}
+default_tz_uuid = {{ nvp_tz_uuid }}
+default_l3_gw_service_uuid = {{ nvp_l3_uuid }}