Neutron related configurations corrected

* Add required subsystems to basic-neutron and basic-all
  personas for nova/neutron components.
* Correct neutron related configurations to make sure
  all required nova/neutron components are started
  successfully.

Change-Id: Ia4a43b7e8ce48f15a3f651891a08f27dd85bd00b

anvil/components/configurators/neutron_plugins/l3.py

@@ -37,7 +37,8 @@ class L3Configurator(neutron_plugins.Configurator):
         plugin_conf.add("admin_tenant_name", params["service_tenant"])
         plugin_conf.add("auth_url", params["endpoints"]["admin"]["uri"])
         plugin_conf.add("root_helper", "sudo neutron-rootwrap /etc/neutron/rootwrap.conf")
-        plugin_conf.add("use_namespaces", "False")
+        plugin_conf.add("use_namespaces", self.installer.get_option("use_namespaces",
+                                                                    default_value=True))
         plugin_conf.add("debug", "False")
         plugin_conf.add("verbose", "True")
         self.setup_rpc(plugin_conf, rpc_backends=MQ_BACKENDS)

anvil/components/configurators/nova.py

@@ -255,20 +255,8 @@ class NovaConfigurator(base.Configurator):
         nova_conf.add("neutron_auth_strategy", "keystone")
         nova_conf.add("neutron_admin_tenant_name", params['service_tenant'])
         nova_conf.add("neutron_url", params['neutron']['endpoints']['admin']['uri'])
-        libvirt_vif_drivers = {
+        nova_conf.add("libvirt_vif_driver",
-            "linuxbridge": "nova.virt.libvirt.vif.NeutronLinuxBridgeVIFDriver",
+                      "nova.virt.libvirt.vif.LibvirtGenericVIFDriver")
-            "openvswitch": "nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver",
-        }
-        # FIXME(aababilov): error on KeyError
-        nova_conf.add(
-            "libvirt_vif_driver",
-            libvirt_vif_drivers[self.installer.get_option('neutron-core-plugin')])
-
-        # FIXME(aababilov): add for linuxbridge:
-        nova_conf.add("libvirt_vif_type", "ethernet")
-        nova_conf.add("connection_type", "libvirt")
-        nova_conf.add("neutron_use_dhcp",
-                      self.installer.get_bool_option('neutron-use-dhcp'))
 
     def _configure_cells(self, nova_conf):
         cells_enabled = self.installer.get_bool_option('enable-cells')

conf/components/neutron.yaml

@@ -7,6 +7,7 @@ api_port: 9696
 protocol: http
 
 core_plugin: openvswitch
+use_namespaces: True
 
 network_vlan_ranges: physnet1:100:299
 physical_interface_mappings: physnet1:100:299

conf/personas/in-a-box/basic-all.yaml

@@ -33,7 +33,6 @@ options:
         enable-spice: false
         local-conductor: false
         mq-type: rabbit
-        neutron-core-plugin: linuxbridge
         neutron-enabled: true
     glance:
         db-sync: true
@@ -60,13 +59,13 @@ subsystems:
     - api
     - cert
     - compute
-    - consoleauth
+    - conductor
     - scheduler
-    - xvpvncproxy
     neutron:
     - server
     - agent
     - l3-agent
+    - dhcp-agent
     cinder:
     - api
     - scheduler

conf/personas/in-a-box/basic-neutron.yaml

@@ -26,7 +26,6 @@ options:
         enable-spice: false
         local-conductor: false
         mq-type: rabbit
-        neutron-core-plugin: linuxbridge
         neutron-enabled: true
     glance:
         db-sync: true
@@ -51,13 +50,13 @@ subsystems:
     - api
     - cert
     - compute
-    - consoleauth
+    - conductor
     - scheduler
-    - xvpvncproxy
     neutron:
     - server
     - agent
     - l3-agent
+    - dhcp-agent
     cinder:
     - api
     - scheduler

conf/personas/in-a-box/basic-web.yaml

@@ -34,7 +34,6 @@ options:
         enable-spice: false
         local-conductor: false
         neutron-enabled: true
-        neutron-core-plugin: linuxbridge
     glance:
         db-sync: true
         load-images: true