diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-19 15:36:57 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-20 15:34:05 -0500 |
| commit | edde00af6a5b811468fe2a0e9bff45346103be92 (patch) | |
| tree | cd5622c911972d06732a2986856c6ffe47b34ceb /playbooks/init | |
| parent | 5faaf9cd1e48864b3ff93276f4b1015b297d0b06 (diff) | |
| download | openshift-edde00af6a5b811468fe2a0e9bff45346103be92.tar.gz openshift-edde00af6a5b811468fe2a0e9bff45346103be92.tar.bz2 openshift-edde00af6a5b811468fe2a0e9bff45346103be92.tar.xz openshift-edde00af6a5b811468fe2a0e9bff45346103be92.zip | |
Move validate_hosts to prerequisites.yml
Move more checks outside of init/main.yml for
speeding up upgrades and other operational plays that
need to run.
Diffstat (limited to 'playbooks/init')
| -rw-r--r-- | playbooks/init/facts.yml | 25 | ||||
| -rw-r--r-- | playbooks/init/main.yml | 3 |
2 files changed, 0 insertions, 28 deletions
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml index ac4429b23..1a5e3b513 100644 --- a/playbooks/init/facts.yml +++ b/playbooks/init/facts.yml @@ -28,26 +28,6 @@ # TODO: Should this be moved into health checks?? # Seems as though any check that happens with a corresponding fail should move into health_checks - - name: Validate python version - ans_dist is fedora and python is v3 - fail: - msg: | - openshift-ansible requires Python 3 for {{ ansible_distribution }}; - For information on enabling Python 3 with Ansible, see https://docs.ansible.com/ansible/python_3_support.html - when: - - ansible_distribution == 'Fedora' - - ansible_python['version']['major'] != 3 - - # TODO: Should this be moved into health checks?? - # Seems as though any check that happens with a corresponding fail should move into health_checks - - name: Validate python version - ans_dist not Fedora and python must be v2 - fail: - msg: "openshift-ansible requires Python 2 for {{ ansible_distribution }}" - when: - - ansible_distribution != 'Fedora' - - ansible_python['version']['major'] != 2 - - # TODO: Should this be moved into health checks?? - # Seems as though any check that happens with a corresponding fail should move into health_checks # Fail as early as possible if Atomic and old version of Docker - when: - openshift_is_atomic | bool @@ -136,11 +116,6 @@ local_facts: sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}" - - name: initialize_facts set_fact repoquery command - set_fact: - repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins' }}" - repoquery_installed: "{{ 'dnf repoquery --latest-limit 1 -d 0 --disableexcludes=all --installed' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins --installed' }}" - - name: Initialize special first-master variables hosts: oo_first_master roles: diff --git a/playbooks/init/main.yml b/playbooks/init/main.yml index 06e8ba504..20457e508 100644 --- a/playbooks/init/main.yml +++ b/playbooks/init/main.yml @@ -20,9 +20,6 @@ - import_playbook: sanity_checks.yml when: not (skip_sanity_checks | default(False)) -- import_playbook: validate_hostnames.yml - when: not (skip_validate_hostnames | default(False)) - - import_playbook: version.yml when: not (skip_verison | default(False)) |