diff options
author | Russell Teague <rteague@redhat.com> | 2017-08-30 22:13:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-30 22:13:12 -0400 |
commit | 3efcda7698d053c16c247e557005d694db58da9e (patch) | |
tree | d407ca6b4f98311978ac3b8fe01c7f4c2f67363a /playbooks/common/openshift-cluster/upgrades/docker | |
parent | 801a90ba2581216b6204fd05915cff3f1900b637 (diff) | |
parent | d8191cbd7a66fc2ba8b4d3cafeccc19afca76850 (diff) | |
download | openshift-3efcda7698d053c16c247e557005d694db58da9e.tar.gz openshift-3efcda7698d053c16c247e557005d694db58da9e.tar.bz2 openshift-3efcda7698d053c16c247e557005d694db58da9e.tar.xz openshift-3efcda7698d053c16c247e557005d694db58da9e.zip |
Merge pull request #5188 from mtnbikenc/test-common-entry
Test: Fail on entry point playbooks in common
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/docker')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml | 2 | ||||
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/tasks/restart.yml (renamed from playbooks/common/openshift-cluster/upgrades/docker/restart.yml) | 0 | ||||
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml (renamed from playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml index 02b8a9d3c..7cc13137f 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -60,7 +60,7 @@ retries: 60 delay: 60 - - include: upgrade.yml + - include: tasks/upgrade.yml when: l_docker_upgrade is defined and l_docker_upgrade | bool - name: Set node schedulability diff --git a/playbooks/common/openshift-cluster/upgrades/docker/restart.yml b/playbooks/common/openshift-cluster/upgrades/docker/tasks/restart.yml index 83f16ac0d..83f16ac0d 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/restart.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/tasks/restart.yml diff --git a/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml index 808cc562c..808cc562c 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml |