Merge pull request apache#122 from dims/tweak-ci-job-for-kubernetes-conformance-tests-001

oops, forgot to enable external cloud provider

Author: dims

playbooks/cloud-provider-openstack-acceptance-test-e2e-conformance/run.yaml

@@ -49,8 +49,12 @@
           export LOG_LEVEL=4
           # We want to use the openstack cloud provider
           export CLOUD_PROVIDER=openstack
+          # We want to run a separate cloud-controller-manager for openstack
+          export EXTERNAL_CLOUD_PROVIDER=true
           # DO NOT change the location of the cloud-config file. It is important for the old cinder provider to work
           export CLOUD_CONFIG=/etc/kubernetes/cloud-config
+          # Specify the OCCM binary
+          export EXTERNAL_CLOUD_PROVIDER_BINARY='{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/openstack-cloud-controller-manager'
 
           # location of where the kubernetes processes log their output
           mkdir -p '{{ ansible_user_dir }}/workspace/logs/kubernetes'
@@ -84,8 +88,6 @@
           # Build all binaries
           export KUBE_FASTBUILD=true
 
-          set -e
-
           # Run e2e test using local deployment/provider
           kubetest --dump=$LOG_DIR \
               --test \