Fix some openvswitch issues

TrivialFix

Change-Id: Ida02cec5b1897f7ed567dda4e8d29b1508f2fb7e

etc/kolla-kubernetes/service_resources.yml

@@ -303,7 +303,7 @@ kolla-kubernetes:
       containers:
       - name: openvswitch-vswitchd
     resources:
-      configmaps:
+      configmap:
       - name: openvswitch-db-server
       - name: openvswitch-vswitchd
       secret:

kolla_kubernetes/service_resources.py

@@ -81,6 +81,11 @@ class KollaKubernetesResources(object):
         files.append(os.path.join(kolla_dir,
                                   'ansible/roles/haproxy/defaults/main.yml'))
 
+        # FIXME I think we need a way to add aditional roles to services
+        # in the service_resources.yaml.
+        files.append(os.path.join(kolla_dir,
+                                  'ansible/roles/neutron/defaults/main.yml'))
+
         # Create the config dict
         x = JinjaUtils.merge_configs_to_dict(
             reversed(files), jvars, debug_regex)

services/openvswitch/openvswitch-ovsdb-daemonset.yml.j2

@@ -87,7 +87,7 @@ spec:
       volumes:
         - name: openvswitch-db-config
           configMap:
-            name: openvswitch-ovsdb
+            name: openvswitch-db-server
         - name: openvswitch-db
           emptyDir: {}
         - name: openvswitch-run