From 60362eeae5e0f9fdcf6d1bcb89a8b532e0e5a202 Mon Sep 17 00:00:00 2001
From: Mathieu Mitchell <mat128@gmail.com>
Date: Mon, 13 Nov 2017 21:54:40 -0500
Subject: [PATCH] Inject mechanism drivers configuration

---
 README                                               | 12 ++++++++++++
 src/config.yaml                                      |  2 +-
 src/lib/charm/openstack/neutron_api_genericswitch.py |  7 +++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000..ae26d8a
--- /dev/null
+++ b/README
@@ -0,0 +1,12 @@
+Basic instructions...
+
+vim /home/ubuntu/switchconfig.ini
+
+
+cd src
+charm build
+
+juju deploy /home/ubuntu/charm-neutron-api-genericswitch/src/builds/neutron-api-genericswitch --resource genericswitch-ml2-config=/home/ubuntu/switchconfig.ini
+//juju config neutron-api-genericswitch pip-requirement-line=alternative-package-name
+
+juju add-relation neutron-api neutron-api-genericswitch
diff --git a/src/config.yaml b/src/config.yaml
index bf79480..d735985 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -2,4 +2,4 @@ options:
   pip-requirement-line:
     type: string
     default: "networking-generic-switch==0.4.0"
-    description: Pip requirement line.
+    description: Pip requirement line. This configuration option is only read on initial installation.
diff --git a/src/lib/charm/openstack/neutron_api_genericswitch.py b/src/lib/charm/openstack/neutron_api_genericswitch.py
index 08160a3..734e3ce 100644
--- a/src/lib/charm/openstack/neutron_api_genericswitch.py
+++ b/src/lib/charm/openstack/neutron_api_genericswitch.py
@@ -79,6 +79,13 @@ class NewtonNeutronAPIGenericSwitchCharm(charms_openstack.charm.OpenStackCharm):
                         'DEFAULT': [
                         ],
                     }
+                },
+                "/etc/neutron/plugins/ml2/ml2_conf.ini": {
+                    "sections": {
+                        'ml2': [
+                            ('mechanism_drivers', 'openvswitch,hyperv,genericswitch')
+                        ]
+                    }
                 }
             }
         }