diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-12 10:39:25 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-12 10:39:25 -0500 |
| commit | ec643bee6b4de6d26f5aea346d73e8158f10939e (patch) | |
| tree | 8bac63b1372a3f5691d7433bb605e5038b823953 /roles | |
| parent | f648f7111efdb16059996667730c7c9b423d75d7 (diff) | |
| parent | 4725d3509e1315ad671a77d355c7a5328578390b (diff) | |
| download | openshift-ec643bee6b4de6d26f5aea346d73e8158f10939e.tar.gz openshift-ec643bee6b4de6d26f5aea346d73e8158f10939e.tar.bz2 openshift-ec643bee6b4de6d26f5aea346d73e8158f10939e.tar.xz openshift-ec643bee6b4de6d26f5aea346d73e8158f10939e.zip | |
Merge pull request #1148 from LutzLange/master
Fix for providing cloud-provider arguments with multiline yaml capability
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 | ||||
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 647476b7f..dfcaf1953 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -87,8 +87,8 @@ kubernetesMasterConfig: - v1beta3 - v1 {% endif %} - apiServerArguments: {{ openshift.master.api_server_args | default(None) | to_json }} - controllerArguments: {{ openshift.master.controller_args | default(None) | to_json }} + apiServerArguments: {{ openshift.master.api_server_args | default(None) | to_padded_yaml( level=2 ) }} + controllerArguments: {{ openshift.master.controller_args | default(None) | to_padded_yaml( level=2 ) }} masterCount: {{ openshift.master.master_count if openshift.master.cluster_method | default(None) == 'native' else 1 }} masterIP: {{ openshift.common.ip }} podEvictionTimeout: "" diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 23bd81f91..cbe811f83 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -11,9 +11,7 @@ imageConfig: format: {{ openshift.node.registry_url }} latest: false kind: NodeConfig -{% if openshift.node.kubelet_args is defined and openshift.node.kubelet_args %} -kubeletArguments: {{ openshift.node.kubelet_args | to_json }} -{% endif %} +kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yaml(level=1) }} masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig {% if openshift.common.use_openshift_sdn %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} |