Merge pull request apache#79 from mrhillsman/modify-dsvm-services-for-ccm

Fixes issue apache#76

Author: mrhillsman

playbooks/openstack-cloud-controller-manager-unittest/run.yaml

@@ -4,12 +4,7 @@
     - clone-devstack-gate-to-workspace
     - role: create-devstack-local-conf
       enable_services:
-        - 'neutron-api'
-        - 'neutron-agent'
-        - 'neutron-l3'
-        - 'neutron-dhcp'
-        - 'neutron-metadata-agent'
-        - 'neutron-metering'
+        - 'neutron'
     - install-devstack
   tasks:
     - shell:

roles/create-devstack-local-conf/tasks/main.yml

@@ -128,3 +128,17 @@
   environment: '{{ zuul | zuul_legacy_vars }}'
   when:
     - '"fwaas-v2" in enable_services'
+
+- name: create devstack local conf with neutron enabled instead of neutron-legacy
+  shell:
+    cmd: |
+      set -e
+      set -x
+      cat << EOF >> /tmp/dg-local.conf
+      enable_service neutron-agent neutron-api neutron-dhcp neutron-l3 neutron-metadata-agent neutron-metering
+      EOF
+    executable: /bin/bash
+    chdir: '{{ ansible_user_dir }}/workspace'
+  environment: '{{ zuul | zuul_legacy_vars }}'
+  when:
+    - '"neutron" in enable_services'