openshift software: improve Name of openshift-ansible tasks

Guillaume Coré

2018-09-25 cbddc5ce240b49a2d07e2b5eb2017dad8aa8bf22

openshift software: improve Name of openshift-ansible tasks

 ansible/roles/host-ocp-installer/tasks/main.yml

@@ -18,7 +18,7 @@
    version: "release-{{ocp_release}}"
  when: clone_openshift_ansible|d(false)|bool

- name: run cloned ansible-playbook -i /etc/ansible/hosts /root/openshift-ansible/playbooks/byo/config.yml (3.7 and earlier)
- name: run openshift-ansible byo/config.yml (from cloned upstream, 3.7 and earlier)
  shell: "ansible-playbook -i /etc/ansible/hosts /root/openshift-ansible/playbooks/byo/config.yml"
  register: openshift_install_log
  tags:
@@ -28,7 +28,7 @@
    - clone_openshift_ansible|d(false)|bool
    - osrelease is version_compare('3.9', '<')

- name: run ansible-playbook -i /etc/ansible/hosts /usr/share/ansible/openshift-ansible/playbooks/byo/config.yml (3.7 and earlier)
- name: run openshift-ansible byo/config.yml (3.7 and earlier)
  shell: "ansible-playbook -i /etc/ansible/hosts /usr/share/ansible/openshift-ansible/playbooks/byo/config.yml"
  register: openshift_install_log
  tags:
@@ -57,7 +57,7 @@
  tags:
    - openshift_installer

- name: run cloned ansible-playbook -i /etc/ansible/hosts /root/openshift-ansible/playbooks/prerequisites.yml (3.9 and later)
- name: run openshift-ansible prerequisites.yml (from cloned upstream, 3.9 and later)
  shell: "ansible-playbook -i /etc/ansible/hosts /root/openshift-ansible/playbooks/prerequisites.yml"
  register: openshift_install_log
  tags:
@@ -67,7 +67,7 @@
    - clone_openshift_ansible|d(false)|bool
    - osrelease is version_compare('3.9', '>=')

- name: run ansible-playbook -i /etc/ansible/hosts /usr/share/ansible/openshift-ansible/playbooks/prerequisites.yml (3.9 and later)
- name: run openshift-ansible prerequisites.yml (3.9 and later)
  shell: "ansible-playbook -i /etc/ansible/hosts /usr/share/ansible/openshift-ansible/playbooks/prerequisites.yml"
  register: openshift_install_log
  tags:
@@ -96,7 +96,7 @@
  tags:
    - openshift_installer

- name: run cloned ansible-playbook -i /etc/ansible/hosts /root/openshift-ansible/playbooks/deploy_cluster.yml (3.9 and later)
- name: run openshift-ansible deploy_cluster.yml (from cloned upstream, 3.9 and later)
  shell: "ansible-playbook -i /etc/ansible/hosts /root/openshift-ansible/playbooks/deploy_cluster.yml"
  register: openshift_install_log
  tags:
@@ -106,7 +106,7 @@
    - clone_openshift_ansible|d(false)|bool
    - osrelease is version_compare('3.9', '>=')

- name: run ansible-playbook -i /etc/ansible/hosts /usr/share/ansible/openshift-ansible/playbooks/deploy_cluster.yml (3.9 and later)
- name: run openshift-ansible deploy_cluster.yml (3.9 and later)
  shell: "ansible-playbook -i /etc/ansible/hosts /usr/share/ansible/openshift-ansible/playbooks/deploy_cluster.yml"
  register: openshift_install_log
  tags:

 ansible/software_playbooks/openshift.yml

@@ -86,7 +86,6 @@
  order: sorted
  hosts:
    - support
#    - "{{ ('tag_' ~ env_type ~ '_' ~ guid ~ '_support') | replace('-', '_') }}"
  vars_files:
    - "{{ ANSIBLE_REPO_PATH }}/configs/{{ env_type }}/env_vars.yml"
  roles:
@@ -102,7 +101,6 @@
  gather_facts: False
  become: yes
  hosts:
#    - "{{ ('tag_' ~ env_type ~ '_' ~ guid ~ '_bastion') | replace('-', '_') }}"
    - bastions
  vars_files:
    - "{{ ANSIBLE_REPO_PATH }}/configs/{{ env_type }}/env_vars.yml"