summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-02 18:56:31 -0800
committerGitHub <noreply@github.com>2018-01-02 18:56:31 -0800
commit861b8620e45008df6cac601725b5a82e9f67907a (patch)
tree97736e0921adcac3a64798554dd10048727e561b /roles
parent3fda828a7ec8a234c309d99cd885f110c570bea2 (diff)
parent46b5705f220022b9eee20f682a330558f9e60258 (diff)
downloadopenshift-861b8620e45008df6cac601725b5a82e9f67907a.tar.gz
openshift-861b8620e45008df6cac601725b5a82e9f67907a.tar.bz2
openshift-861b8620e45008df6cac601725b5a82e9f67907a.tar.xz
openshift-861b8620e45008df6cac601725b5a82e9f67907a.zip
Merge pull request #6583 from mgugino-upstream-stage/aws-creds-location
Automatic merge from submit-queue. Correct kublet_args cloud-provider directories This commit updates kublet_args to correct cloudprovider configuration file locaitons. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1527203
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/defaults/main.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index a90aad532..5eb9cef15 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -34,19 +34,19 @@ openshift_node_kubelet_args_dict:
cloud-provider:
- aws
cloud-config:
- - "{{ openshift_config_base ~ '/aws.conf' }}"
+ - "{{ openshift_config_base ~ '/cloudprovider/aws.conf' }}"
node-labels: "{{ l_node_kubelet_node_labels }}"
openstack:
cloud-provider:
- openstack
cloud-config:
- - "{{ openshift_config_base ~ '/openstack.conf' }}"
+ - "{{ openshift_config_base ~ '/cloudprovider/openstack.conf' }}"
node-labels: "{{ l_node_kubelet_node_labels }}"
gce:
cloud-provider:
- gce
cloud-config:
- - "{{ openshift_config_base ~ '/gce.conf' }}"
+ - "{{ openshift_config_base ~ '/cloudprovider/gce.conf' }}"
node-labels: "{{ l_node_kubelet_node_labels }}"
undefined:
node-labels: "{{ l_node_kubelet_node_labels }}"