Merge branch 'master' into master

bzhaoopenstack · Jun 19, 2018 · f9099ff · f9099ff
2 parents e35ac65 + f8dad00
commit f9099ff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/playbooks/cloud-provider-openstack-acceptance-test-flexvolume-cinder/run.yaml b/playbooks/cloud-provider-openstack-acceptance-test-flexvolume-cinder/run.yaml
@@ -8,6 +8,7 @@
         executable: /bin/bash
   roles:
     - config-golang
+    - install-k8s
     - clone-devstack-gate-to-workspace
     - role: create-devstack-local-conf
       enable_services:

diff --git a/...s/cloud-provider-openstack-acceptance-test-keystone-authentication-authorization/run.yaml b/...s/cloud-provider-openstack-acceptance-test-keystone-authentication-authorization/run.yaml
@@ -1,6 +1,7 @@
 - hosts: all
   roles:
     - config-golang
+    - install-k8s
     - clone-devstack-gate-to-workspace
     - role: install-devstack
       environment:

diff --git a/playbooks/cloud-provider-openstack-acceptance-test-standalone-cinder/run.yaml b/playbooks/cloud-provider-openstack-acceptance-test-standalone-cinder/run.yaml
@@ -2,6 +2,7 @@
   become: yes
   roles:
     - config-golang
+    - install-k8s
     - clone-devstack-gate-to-workspace
     - role: install-devstack
       environment:

diff --git a/playbooks/cloud-provider-openstack-format/run.yaml b/playbooks/cloud-provider-openstack-format/run.yaml
@@ -1,5 +1,6 @@
 - hosts: all
   roles:
+    - config-golang
     - move-k8s-repo-to-k8s-specific-dir
   become: yes
   tasks: