diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-10-05 12:53:10 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2015-12-15 15:45:45 -0500 |
| commit | 8e7c5c970b8adc83fd6d5cad115f4edb06b36d98 (patch) | |
| tree | 408ffd1864ae9cd34ef238d5c5a9ff2aa59193d9 /playbooks/common/openshift-cluster | |
| parent | a0b6fc7db1be2cf6190d982f90e96f4c39a4c699 (diff) | |
| download | openshift-8e7c5c970b8adc83fd6d5cad115f4edb06b36d98.tar.gz openshift-8e7c5c970b8adc83fd6d5cad115f4edb06b36d98.tar.bz2 openshift-8e7c5c970b8adc83fd6d5cad115f4edb06b36d98.tar.xz openshift-8e7c5c970b8adc83fd6d5cad115f4edb06b36d98.zip | |
Containerization work by @sdodson
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/update_repos_and_packages.yml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 482fa8441..a62d60167 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -1,6 +1,8 @@ --- - include: evaluate_groups.yml +- include: ../openshift-docker/config.yml + - include: ../openshift-etcd/config.yml - include: ../openshift-master/config.yml diff --git a/playbooks/common/openshift-cluster/update_repos_and_packages.yml b/playbooks/common/openshift-cluster/update_repos_and_packages.yml index 6e4ad7d3f..9a303c62d 100644 --- a/playbooks/common/openshift-cluster/update_repos_and_packages.yml +++ b/playbooks/common/openshift-cluster/update_repos_and_packages.yml @@ -8,5 +8,6 @@ ansible_distribution == "RedHat" and lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) | default('no', True) | lower in ['no', 'false'] - - {role: openshift_repos, when: not is_atomic} + and not openshift.common.is_atomic | bool + - openshift_repos - os_update_latest |