diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-22 17:30:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 17:30:30 -0500 |
| commit | 763831e73432ab3db69efdbfd06a171be7d0a2af (patch) | |
| tree | 14fa4a8ce48add38a18daff5cfe7bec1df50694a | |
| parent | 27e47d32dc795dd27e901ca8618c90b7c1303547 (diff) | |
| parent | daf9d723a7b7f8d09706558eb67b7ed5ad6519f6 (diff) | |
| download | openshift-763831e73432ab3db69efdbfd06a171be7d0a2af.tar.gz openshift-763831e73432ab3db69efdbfd06a171be7d0a2af.tar.bz2 openshift-763831e73432ab3db69efdbfd06a171be7d0a2af.tar.xz openshift-763831e73432ab3db69efdbfd06a171be7d0a2af.zip | |
Merge pull request #3726 from sdodson/oreg_url_on_upgrade
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_node_upgrade/tasks/main.yml | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index e16a1f6d0..c6e799261 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -64,6 +64,7 @@ static: yes roles: - openshift_facts + - lib_utils post_tasks: # Run the pre-upgrade hook if defined: @@ -113,6 +114,13 @@ state: link when: ca_crt_stat.stat.isreg and not ca_bundle_stat.stat.exists + - name: Update oreg value + yedit: + src: "{{ openshift.common.config_base }}/master/master-config.yaml" + key: 'imageConfig.format' + value: "{{ oreg_url }}" + when: oreg_url is defined + # Run the upgrade hook prior to restarting services/system if defined: - debug: msg="Running master upgrade hook {{ openshift_master_upgrade_hook }}" when: openshift_master_upgrade_hook is defined diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml index 2467dc971..f052ed505 100644 --- a/roles/openshift_node_upgrade/tasks/main.yml +++ b/roles/openshift_node_upgrade/tasks/main.yml @@ -73,6 +73,13 @@ # Mandatory Docker restart, ensure all containerized services are running: - include: docker/restart.yml +- name: Update oreg value + yedit: + src: "{{ openshift.common.config_base }}/node/node-config.yaml" + key: 'imageConfig.format' + value: "{{ oreg_url }}" + when: oreg_url is defined + - name: Restart rpm node service service: name: "{{ openshift.common.service_type }}-node" |