diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-17 02:37:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 02:37:24 -0700 |
| commit | 768a667c5788a8074ff1f31caf8b43af92f16344 (patch) | |
| tree | eb721c2c608b3ce9a13a8c4e2636db0df25d071d /roles/openshift_master | |
| parent | 8941dd5ee2f287d54f77e50186bba6662c696458 (diff) | |
| parent | 3442745ebc9f1e272cdb08bfd07655b7ba8414e7 (diff) | |
| download | openshift-768a667c5788a8074ff1f31caf8b43af92f16344.tar.gz openshift-768a667c5788a8074ff1f31caf8b43af92f16344.tar.bz2 openshift-768a667c5788a8074ff1f31caf8b43af92f16344.tar.xz openshift-768a667c5788a8074ff1f31caf8b43af92f16344.zip | |
Merge pull request #5744 from mgugino-upstream-stage/latest-image-config
Automatic merge from submit-queue.
Add ability to set node and master imageConfig to latest
Currently, imageConfig.latest is hard-coded to false.
This commit adds an appropriate boolean to enable
setting to true.
Fixes: https://github.com/openshift/openshift-ansible/issues/1422
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 7e62a8c6d..f861a8e4d 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -51,3 +51,6 @@ r_openshift_master_data_dir: "{{ r_openshift_master_data_dir_default }}" r_openshift_master_sdn_network_plugin_name_default: "{{ os_sdn_network_plugin_name | default('redhat/openshift-ovs-subnet') }}" r_openshift_master_sdn_network_plugin_name: "{{ r_openshift_master_sdn_network_plugin_name_default }}" + +openshift_master_image_config_latest_default: "{{ openshift_image_config_latest | default(False) }}" +openshift_master_image_config_latest: "{{ openshift_master_image_config_latest_default }}" diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 9b3fbcf49..c555a8791 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -115,7 +115,7 @@ etcdStorageConfig: openShiftStorageVersion: v1 imageConfig: format: {{ openshift.master.registry_url }} - latest: false + latest: {{ openshift_master_image_config_latest }} {% if 'image_policy_config' in openshift.master %} imagePolicyConfig:{{ openshift.master.image_policy_config | to_padded_yaml(level=1) }} {% endif %} |