Updated all roles to use include_role instead by @wkulhanek

Wolfgang Kulhanek

2018-08-28 d734cab0e201de3c75d5a7d2e1bab8c81a2ba7b5

Updated all roles to use include_role instead by @wkulhanek

 ansible/configs/ocp-workshop/post_software.yml

@@ -110,7 +110,7 @@
  - opentlc_integration
  tasks:
  - name: Configure Bastion
    import_role:
    include_role:
      name: "{{ ANSIBLE_REPO_PATH }}/roles/opentlc-integration"
    vars:
      no_log: yes
@@ -392,7 +392,7 @@
  - env-specific
  - install_openwhisk
  tasks:
  - import_role:
  - include_role:
      name: "{{ ANSIBLE_REPO_PATH }}/roles/ocp-infra-openwhisk"
    when:
      - install_openwhisk|d(False)|bool
@@ -412,7 +412,7 @@
  tags:
    - install_prometheus
  tasks:
    - import_role:
    - include_role:
        name: "{{ ANSIBLE_REPO_PATH }}/roles/ocp-infra-prometheus-pre310"
      when:
      - install_prometheus|d(False)|bool
@@ -511,7 +511,7 @@
  - "{{ ANSIBLE_REPO_PATH }}/configs/{{ env_type }}/env_vars.yml"
  tasks:
  - name: Customize Service Catalog UI for workshops
    import_role:
    include_role:
      name: "{{ ANSIBLE_REPO_PATH }}/roles/ocp-infra-enable-custom-catalog"
    when: enable_workshops_catalog|d(False)|bool
  tags:
@@ -526,7 +526,7 @@
  vars_files:
  - "{{ ANSIBLE_REPO_PATH }}/configs/{{ env_type }}/env_vars.yml"
  tasks:
  - import_role:
  - include_role:
      name: "{{ ANSIBLE_REPO_PATH }}/roles/ocp-infra-nexus"
    vars:
      desired_project: "{{admin_project}}"
@@ -547,7 +547,7 @@
  - env-specific
  - install_aws_broker
  tasks:
  - import_role:
  - include_role:
      name: "{{ ANSIBLE_REPO_PATH }}/roles/ocp-infra-aws-service-broker"
    when: install_aws_broker|d(False)|bool

@@ -563,7 +563,7 @@
  - install_openshiftapb
  tasks:
  - name: Update ASB
    import_role:
    include_role:
      name: "{{ ANSIBLE_REPO_PATH }}/roles/openshift-ansible-broker"
    when: install_openshiftapb|d(False)|bool

@@ -579,7 +579,7 @@
  - install_maistra
  tasks:
  - name: Install Maistra
    import_role:
    include_role:
      name: "{{ ANSIBLE_REPO_PATH }}/roles/ocp-infra-maistra"
    vars:
      openshift_master_public: "{{ master_lb_dns }}"
@@ -668,13 +668,15 @@
  - "{{ ANSIBLE_REPO_PATH }}/configs/{{ env_type }}/env_secret_vars.yml"
  vars:
    zabbix_auto_registration_keyword: OCP Master
  roles:
  - role: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client"
    when: install_zabbix|bool
  - role: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client-openshift-master"
    when: install_zabbix|bool
  - role: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client-openshift-node"
    when: install_zabbix|bool
  tasks:
    - when: install_zabbix|bool
      block:
      - include_role:
          name: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client"
      - include_role:
          name: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client-openshift-master"
      - include_role:
          name: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client-openshift-node"
  tags:
  - env-specific
  - install_zabbix
@@ -692,11 +694,13 @@
    zabbix_auto_registration_keyword: OCP Node
    zabbix_token: "{{ hostvars[groups['masters'][0]].zabbix_token }}"
    hawkular_route: "{{ hostvars[groups['masters'][0]].hawkular_route }}"
  roles:
  - role: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client"
    when: install_zabbix|bool
  - role: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client-openshift-node"
    when: install_zabbix|bool
  tasks:
  - when: install_zabbix|bool
    block:
      - include_role:
          name: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client"
      - include_role:
          name: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client-openshift-node"
  tags:
  - env-specific
  - install_zabbix
@@ -712,9 +716,10 @@
  - "{{ ANSIBLE_REPO_PATH }}/configs/{{ env_type }}/env_secret_vars.yml"
  vars:
    zabbix_auto_registration_keyword: OCP Host
  roles:
  - role: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client"
    when: install_zabbix|bool
  tasks:
    - when: install_zabbix_bool
      include_role:
        name: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client"
  tags:
  - env-specific
  - install_zabbix
@@ -773,7 +778,7 @@
  - "{{ ANSIBLE_REPO_PATH }}/configs/{{ env_type }}/env_vars.yml"
  - "{{ ANSIBLE_REPO_PATH }}/configs/{{ env_type }}/env_secret_vars.yml"
  tasks:
  - import_role:
  - include_role:
      name: "{{ ANSIBLE_REPO_PATH }}/roles/bastion-opentlc-ipa"
    when: install_ipa_client|bool