diff --git a/.github/workflows/ansible-lint-sap_general_preconfigure.yml b/.github/workflows/ansible-lint-sap_general_preconfigure.yml index 6355423d1..b382e2a3b 100644 --- a/.github/workflows/ansible-lint-sap_general_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_general_preconfigure.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_general_preconfigure @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_general_preconfigure/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_general_preconfigure/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_general_preconfigure/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_general_preconfigure - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_general_preconfigure diff --git a/.github/workflows/ansible-lint-sap_ha_install_hana_hsr.yml b/.github/workflows/ansible-lint-sap_ha_install_hana_hsr.yml index d6e20713f..9186fb714 100644 --- a/.github/workflows/ansible-lint-sap_ha_install_hana_hsr.yml +++ b/.github/workflows/ansible-lint-sap_ha_install_hana_hsr.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_ha_install_hana_hsr @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_ha_install_hana_hsr/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_ha_install_hana_hsr/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_ha_install_hana_hsr/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_ha_install_hana_hsr - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_ha_install_hana_hsr diff --git a/.github/workflows/ansible-lint-sap_ha_pacemaker_cluster.yml b/.github/workflows/ansible-lint-sap_ha_pacemaker_cluster.yml index b1f0bc420..0b25e1ee8 100644 --- a/.github/workflows/ansible-lint-sap_ha_pacemaker_cluster.yml +++ b/.github/workflows/ansible-lint-sap_ha_pacemaker_cluster.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_ha_pacemaker_cluster @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_ha_pacemaker_cluster/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_ha_pacemaker_cluster/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_ha_pacemaker_cluster/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_ha_pacemaker_cluster - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_ha_pacemaker_cluster diff --git a/.github/workflows/ansible-lint-sap_hana_install.yml b/.github/workflows/ansible-lint-sap_hana_install.yml index 2196b8c5e..0a72e1f80 100644 --- a/.github/workflows/ansible-lint-sap_hana_install.yml +++ b/.github/workflows/ansible-lint-sap_hana_install.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_hana_install @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_hana_install/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_hana_install/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_hana_install/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_hana_install - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_hana_install diff --git a/.github/workflows/ansible-lint-sap_hana_preconfigure.yml b/.github/workflows/ansible-lint-sap_hana_preconfigure.yml index 3fcba086f..bb72ca5ed 100644 --- a/.github/workflows/ansible-lint-sap_hana_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_hana_preconfigure.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_hana_preconfigure @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_hana_preconfigure/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_hana_preconfigure/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_hana_preconfigure/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_hana_preconfigure - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_hana_preconfigure diff --git a/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml b/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml index 9ed7999e8..219a9fcf1 100644 --- a/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_hypervisor_node_preconfigure @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_hypervisor_node_preconfigure/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_hypervisor_node_preconfigure/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_hypervisor_node_preconfigure/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_hypervisor_node_preconfigure - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_hypervisor_node_preconfigure diff --git a/.github/workflows/ansible-lint-sap_install_media_detect.yml b/.github/workflows/ansible-lint-sap_install_media_detect.yml index e8cb49a8a..867b710bb 100644 --- a/.github/workflows/ansible-lint-sap_install_media_detect.yml +++ b/.github/workflows/ansible-lint-sap_install_media_detect.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_install_media_detect @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_install_media_detect/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_install_media_detect/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_install_media_detect/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_install_media_detect - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_install_media_detect diff --git a/.github/workflows/ansible-lint-sap_maintain_etc_hosts.yml b/.github/workflows/ansible-lint-sap_maintain_etc_hosts.yml index d0c3271ec..89e8d4824 100644 --- a/.github/workflows/ansible-lint-sap_maintain_etc_hosts.yml +++ b/.github/workflows/ansible-lint-sap_maintain_etc_hosts.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_maintain_etc_hosts @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_maintain_etc_hosts/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_maintain_etc_hosts/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_maintain_etc_hosts/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_maintain_etc_hosts - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_maintain_etc_hosts diff --git a/.github/workflows/ansible-lint-sap_netweaver_preconfigure.yml b/.github/workflows/ansible-lint-sap_netweaver_preconfigure.yml index 387a2a690..751cf6402 100644 --- a/.github/workflows/ansible-lint-sap_netweaver_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_netweaver_preconfigure.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_netweaver_preconfigure @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_netweaver_preconfigure/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_netweaver_preconfigure/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_netweaver_preconfigure/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_netweaver_preconfigure - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_netweaver_preconfigure diff --git a/.github/workflows/ansible-lint-sap_storage_setup.yml b/.github/workflows/ansible-lint-sap_storage_setup.yml index fa5d7ac92..c5ee19db5 100644 --- a/.github/workflows/ansible-lint-sap_storage_setup.yml +++ b/.github/workflows/ansible-lint-sap_storage_setup.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_storage_setup @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_storage_setup/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_storage_setup/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_storage_setup/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_storage_setup - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_storage_setup diff --git a/.github/workflows/ansible-lint-sap_swpm.yml b/.github/workflows/ansible-lint-sap_swpm.yml index 2d1587cbe..98378c6a9 100644 --- a/.github/workflows/ansible-lint-sap_swpm.yml +++ b/.github/workflows/ansible-lint-sap_swpm.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_swpm @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_swpm/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_swpm/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_swpm/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.9' - - - name: Install test dependencies - run: | - pip3 install ansible==7.5.0 - pip3 install ansible-compat==3.0.2 - pip3 install ansible-core==2.14.5 - pip3 install ansible-lint==6.8.6 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_swpm - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_swpm diff --git a/.github/workflows/ansible-lint-sap_vm_preconfigure.yml b/.github/workflows/ansible-lint-sap_vm_preconfigure.yml index 05d84672a..346012e2d 100644 --- a/.github/workflows/ansible-lint-sap_vm_preconfigure.yml +++ b/.github/workflows/ansible-lint-sap_vm_preconfigure.yml @@ -1,6 +1,6 @@ --- -# Workflow for ansible-lint of a role +# Workflow for ansible-lint of a role, using reusable workflow name: ansible-lint of the role sap_vm_preconfigure @@ -9,6 +9,7 @@ on: branches: - main - dev + - github-workflow-test paths: - 'roles/sap_vm_preconfigure/**' pull_request: @@ -17,27 +18,16 @@ on: - dev paths: - 'roles/sap_vm_preconfigure/**' + workflow_dispatch: + branches: + - main + - dev + - github-workflow-test + paths: + - 'roles/sap_vm_preconfigure/**' jobs: - ansible-lint: - runs-on: ubuntu-latest - - steps: - - name: Check out the code - uses: actions/checkout@main - - - name: Set up Python 3 - uses: actions/setup-python@main - with: - python-version: '3.12' - - - name: Install test dependencies - run: | - pip3 install ansible==9.1.0 - pip3 install ansible-compat==4.1.10 - pip3 install ansible-core==2.16.2 - pip3 install ansible-lint==6.22.1 - - - name: Run ansible-lint - working-directory: /home/runner/work/community.sap_install/community.sap_install/roles/sap_vm_preconfigure - run: ansible-lint + ansible-lint-exec: + uses: sap-linuxlab/community.sap_install/.github/workflows/ansible-lint-sap_reusable_workflow.yml@main + with: + role: sap_vm_preconfigure diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index b97f0a635..d43bc8a1f 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -16,10 +16,10 @@ jobs: steps: - name: Check out the code - uses: actions/checkout@main + uses: actions/checkout@v4 - name: Set up Python 3 - uses: actions/setup-python@main + uses: actions/setup-python@v5 with: python-version: '3.12' diff --git a/.github/workflows/ansible-test-sanity.yml b/.github/workflows/ansible-test-sanity.yml index b3ce12573..90b32f207 100644 --- a/.github/workflows/ansible-test-sanity.yml +++ b/.github/workflows/ansible-test-sanity.yml @@ -16,12 +16,12 @@ jobs: steps: - name: Check out the code - uses: actions/checkout@main + uses: actions/checkout@v4 - name: Set up Python 3 - uses: actions/setup-python@main + uses: actions/setup-python@v5 with: - python-version: '3.9' + python-version: '3.12' - name: Install test dependencies run: | diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a1fbceb70..22b92457d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,15 @@ community.sap_install Release Notes .. contents:: Topics +v1.3.5 +====== + +Release Summary +--------------- + +| Release Date: 2024-01-31 +| sap_hypervisor_node_preconfigure: Bug fix for role name and path for included tasks + v1.3.4 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index cd27c4a59..3eb148f64 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -149,3 +149,10 @@ releases: ' release_date: '2024-01-15' + 1.3.5: + changes: + release_summary: '| Release Date: 2024-01-31 + + | sap_hypervisor_node_preconfigure: Bug fix for role name and path for included tasks + ' + release_date: '2024-01-31' diff --git a/galaxy.yml b/galaxy.yml index e00bfe582..a6d273176 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -10,7 +10,7 @@ namespace: community name: sap_install # The version of the collection. Must be compatible with semantic versioning -version: 1.3.4 +version: 1.3.5 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md @@ -32,12 +32,12 @@ description: Collection of Ansible Roles for SAP software installation in variou # Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only # accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file' -license: - - Apache-2.0 +#license: +# - Apache-2.0 # The path to the license file for the collection. This path is relative to the root of the collection. This key is # mutually exclusive with 'license' -license_file: '' +license_file: 'LICENSE' # A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character # requirements as 'namespace' and 'name' diff --git a/playbooks/sample-sap-hypervisor-redhat_ocp_virt-preconfigure.yml b/playbooks/sample-sap-hypervisor-redhat_ocp_virt-preconfigure.yml index 285e60488..7cf165ac4 100644 --- a/playbooks/sample-sap-hypervisor-redhat_ocp_virt-preconfigure.yml +++ b/playbooks/sample-sap-hypervisor-redhat_ocp_virt-preconfigure.yml @@ -4,8 +4,9 @@ serial: 1 vars: sap_hypervisor_node_platform: redhat_ocp_virt - - tasks: - - name: Include Role - ansible.builtin.include_role: - name: sap_hypervisor_node_preconfigure + sap_hypervisor_node_kubeconfig: "{{ lookup( 'ansible.builtin.env', 'KUBECONFIG') }}" + environment: + KUBECONFIG: "{{ sap_hypervisor_node_kubeconfig }}" + K8S_AUTH_KUBECONFIG: "{{ sap_hypervisor_node_kubeconfig }}" + roles: + - { role: community.sap_install.sap_hypervisor_node_preconfigure } diff --git a/playbooks/vars/sample-variables-sap-hypervisor-node-preconfigure-rh_ocp_virt.yml b/playbooks/vars/sample-variables-sap-hypervisor-node-preconfigure-rh_ocp_virt.yml index 6f7f9af81..4e022e680 100644 --- a/playbooks/vars/sample-variables-sap-hypervisor-node-preconfigure-rh_ocp_virt.yml +++ b/playbooks/vars/sample-variables-sap-hypervisor-node-preconfigure-rh_ocp_virt.yml @@ -1,3 +1,8 @@ +sap_hypervisor_node_preconfigure_install_operators: true +sap_hypervisor_node_preconfigure_install_hpp: true +sap_hypervisor_node_preconfigure_install_trident: false +sap_hypervisor_node_preconfigure_setup_worker_nodes: true + sap_hypervisor_node_preconfigure_cluster_config: # URL under which the OCP cluster is reachable diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/main.yml b/roles/sap_hypervisor_node_preconfigure/tasks/main.yml index ad1d9fe14..173633905 100644 --- a/roles/sap_hypervisor_node_preconfigure/tasks/main.yml +++ b/roles/sap_hypervisor_node_preconfigure/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: SAP certified hypervisor node preconfigure - Include Vars for {{ sap_hypervisor_node_platform }} - ansible.builtin.include_vars: "vars/platform_defaults_{{ sap_hypervisor_node_platform }}.yml" + ansible.builtin.include_vars: "platform_defaults_{{ sap_hypervisor_node_platform }}.yml" - name: SAP certified hypervisor node preconfigure - Include Tasks for {{ sap_hypervisor_node_platform }} - ansible.builtin.include_tasks: "tasks/platform/{{ sap_hypervisor_node_platform }}/main.yml" + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/main.yml" diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/install-cnv-operator.yml b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/install-cnv-operator.yml index 1a08c9306..e36e26ffa 100644 --- a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/install-cnv-operator.yml +++ b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/install-cnv-operator.yml @@ -38,7 +38,7 @@ - name: Wait ansible.builtin.pause: - seconds: 60 + seconds: 300 - name: Get Install Plan Name retries: 10 diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml index 5e4cedd53..f815d1d54 100644 --- a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml +++ b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml @@ -61,22 +61,22 @@ when: __sap_hypervisor_node_preconfigure_register_worker_memory_gib | int >= 512 - name: Include prepare - ansible.builtin.include_tasks: prepare.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/prepare.yml" - name: Include tuned virtual host - ansible.builtin.include_tasks: tuned-virtual-host.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/tuned-virtual-host.yml" - name: Include install CNV operator - ansible.builtin.include_tasks: install-cnv-operator.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/install-cnv-operator.yml" when: sap_hypervisor_node_preconfigure_install_operators - name: Include install sriov operator - ansible.builtin.include_tasks: install-sriov-operator.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/install-sriov-operator.yml" when: sap_hypervisor_node_preconfigure_install_operators - name: Include install nmstate operator - ansible.builtin.include_tasks: install-nmstate-operator.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/install-nmstate-operator.yml" when: sap_hypervisor_node_preconfigure_install_operators - name: Include install virtctl - ansible.builtin.include_tasks: install-virtctl.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/install-virtctl.yml" - name: Include setup worker nodes - ansible.builtin.include_tasks: setup-worker-nodes.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/setup-worker-nodes.yml" when: sap_hypervisor_node_preconfigure_setup_workers # How to wait for node to be scheduleable? (NodeSchedulable) @@ -90,9 +90,9 @@ var: __sap_hypervisor_node_preconfigure_register_nodes_ready.stdout_lines - name: Include Trident installation - ansible.builtin.include_tasks: install-trident.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/install-trident.yml" when: sap_hypervisor_node_preconfigure_install_trident - name: Include local storage creation (HPP) - ansible.builtin.include_tasks: install-hpp.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/install-hpp.yml" when: sap_hypervisor_node_preconfigure_install_hpp diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/setup-worker-nodes.yml b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/setup-worker-nodes.yml index 5290093d4..29420bee6 100644 --- a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/setup-worker-nodes.yml +++ b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/setup-worker-nodes.yml @@ -1,6 +1,6 @@ --- - name: Include configure worker - ansible.builtin.include_tasks: configure-worker-node.yml + ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/configure-worker-node.yml" with_items: "{{ sap_hypervisor_node_preconfigure_cluster_config.workers }}" loop_control: loop_var: __sap_hypervisor_node_preconfigure_register_worker