diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-16 02:01:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 02:01:33 -0400 |
| commit | b2b9e5e3e92da59d1066890724ab3fc7c8a97bff (patch) | |
| tree | eba54df4f0258b97f8671134a491f7ded6abd957 | |
| parent | f042257e22053d0ac47f3e532e749d4fce75d9b5 (diff) | |
| parent | a24cf59bbb6cf7b06ca4ad21fdec73a76ba7b947 (diff) | |
| download | openshift-b2b9e5e3e92da59d1066890724ab3fc7c8a97bff.tar.gz openshift-b2b9e5e3e92da59d1066890724ab3fc7c8a97bff.tar.bz2 openshift-b2b9e5e3e92da59d1066890724ab3fc7c8a97bff.tar.xz openshift-b2b9e5e3e92da59d1066890724ab3fc7c8a97bff.zip | |
Merge pull request #5096 from mtnbikenc/remove-orphans
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/containerized_node_upgrade.yml | 14 | ||||
| l--------- | playbooks/common/openshift-cluster/upgrades/master_docker | 1 |
2 files changed, 0 insertions, 15 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/containerized_node_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/containerized_node_upgrade.yml deleted file mode 100644 index 9f7961614..000000000 --- a/playbooks/common/openshift-cluster/upgrades/containerized_node_upgrade.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# This is a hack to allow us to use systemd_units.yml, but skip the handlers which -# restart services. We will unconditionally restart all containerized services -# because we have to unconditionally restart Docker: -- set_fact: - skip_node_svc_handlers: True - -- name: Update systemd units - include: ../../../../roles/openshift_node/tasks/systemd_units.yml openshift_version={{ openshift_image_tag }} - -# This is a no-op because of skip_node_svc_handlers, but lets us trigger it before end of -# play when the node has already been marked schedulable again. (this would look strange -# in logs otherwise) -- meta: flush_handlers diff --git a/playbooks/common/openshift-cluster/upgrades/master_docker b/playbooks/common/openshift-cluster/upgrades/master_docker deleted file mode 120000 index 6aeca2842..000000000 --- a/playbooks/common/openshift-cluster/upgrades/master_docker +++ /dev/null @@ -1 +0,0 @@ -../../../../roles/openshift_master/templates/master_docker
\ No newline at end of file |