Rebase and update for nvp->nsx plugin rename

charm-helpers.yaml

@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: ../charm-helpers
 destination: hooks/charmhelpers
 include:
     - core

config.yaml

@@ -69,10 +69,12 @@ options:
       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 @@ options:
     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 @@ options:
   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

hooks/charmhelpers/contrib/openstack/context.py

@@ -570,7 +570,7 @@ class NeutronContext(OSContextGenerator):
 
         if self.plugin == 'ovs':
             ctxt.update(self.ovs_ctxt())
-        elif self.plugin == 'nvp':
+        elif self.plugin in ['nvp', 'nsx']:
             ctxt.update(self.nvp_ctxt())
 
         alchemy_flags = config('neutron-alchemy-flags')

hooks/charmhelpers/contrib/openstack/neutron.py

@@ -114,14 +114,30 @@ def neutron_plugins():
             'server_packages': ['neutron-server',
                                 'neutron-plugin-nicira'],
             'server_services': ['neutron-server']
+        },
+        'nsx': {
+            'config': '/etc/neutron/plugins/vmware/nsx.ini',
+            'driver': 'vmware',
+            'contexts': [
+                context.SharedDBContext(user=config('neutron-database-user'),
+                                        database=config('neutron-database'),
+                                        relation_prefix='neutron',
+                                        ssl_dir=NEUTRON_CONF_DIR)],
+            'services': [],
+            'packages': [],
+            'server_packages': ['neutron-server',
+                                'neutron-plugin-vmware'],
+            'server_services': ['neutron-server']
         }
     }
-    # NOTE: patch in ml2 plugin for icehouse onwards
     if release >= 'icehouse':
+        # NOTE: patch in ml2 plugin for icehouse onwards
         plugins['ovs']['config'] = '/etc/neutron/plugins/ml2/ml2_conf.ini'
         plugins['ovs']['driver'] = 'neutron.plugins.ml2.plugin.Ml2Plugin'
         plugins['ovs']['server_packages'] = ['neutron-server',
                                              'neutron-plugin-ml2']
+        # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
+        plugins['nvp'] = plugins['nsx']
     return plugins
 
 

hooks/nova_cc_context.py

@@ -161,7 +161,7 @@ class NeutronCCContext(context.NeutronContext):
     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'):

templates/icehouse/neutron.conf

@@ -68,4 +68,4 @@ admin_password = {{ admin_password }}
 [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
+service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default