diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-18 10:26:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 10:26:49 -0800 |
| commit | 2efead33407ed6124eae589026d3ba539a6bd8e5 (patch) | |
| tree | e9ac10966a1438718143b1a4a476037429d843e2 /roles/openshift_node | |
| parent | 13cdf9cbd05fde7632cb06e4cc843648717f8c38 (diff) | |
| parent | ac68e9821fd38da3525772c3bc7713ba80ecd10b (diff) | |
| download | openshift-2efead33407ed6124eae589026d3ba539a6bd8e5.tar.gz openshift-2efead33407ed6124eae589026d3ba539a6bd8e5.tar.bz2 openshift-2efead33407ed6124eae589026d3ba539a6bd8e5.tar.xz openshift-2efead33407ed6124eae589026d3ba539a6bd8e5.zip | |
Merge pull request #6768 from weherdh/master
Automatic merge from submit-queue.
Add Azure to support openshift_cloudprovider_kind
Try to fix this as an example. I checked it works.
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index c1fab4382..0b10413c5 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -48,6 +48,12 @@ openshift_node_kubelet_args_dict: cloud-config: - "{{ openshift_config_base ~ '/cloudprovider/gce.conf' }}" node-labels: "{{ l_node_kubelet_node_labels }}" + azure: + cloud-provider: + - azure + cloud-config: + - "{{ openshift_config_base ~ '/cloudprovider/azure.conf' }}" + node-labels: "{{ l_node_kubelet_node_labels }}" undefined: node-labels: "{{ l_node_kubelet_node_labels }}" |