diff --git a/.github/actions/make-integ-config/action.yml b/.github/actions/make-integ-config/action.yml index 0c9182060..b88fc5eda 100644 --- a/.github/actions/make-integ-config/action.yml +++ b/.github/actions/make-integ-config/action.yml @@ -9,21 +9,22 @@ inputs: description: 'SC_HOST environ variable' required: true # default: 'World' - sc_username: - description: 'sc_username variable' + # Node with IP .50 is our physical node. + sc_username_50: + description: 'sc_username variable to access physical nodes' required: true - sc_password: - description: 'sc_password variable' + sc_password_50: + description: 'sc_password variable to access physical nodes' required: true smb_password: description: 'smb_password variable' required: true - sc_replication_dest_password: - description: 'sc_replication_dest_password variable' - required: true working_directory: description: 'Path to working directory' required: true + oidc_client_secret: + description: 'oidc_client_secret' + required: true runs: using: "composite" steps: @@ -31,13 +32,18 @@ runs: shell: bash - run: | cd ${{ inputs.working_directory }} - echo "${{ inputs.ci_config_all }}" > tests/integration/integration_config.yml - cat tests/integration/integration_config.yml + cat <integ_config_vars.yml + sc_username_50: ${{ inputs.sc_username_50 }} + sc_password_50: ${{ inputs.sc_password_50 }} + smb_username: ;administrator + smb_password: ${{ inputs.smb_password }} + smb_server: 10.5.11.39 + smb_share: /cidata + oidc_client_id: d2298ec0-0596-49d2-9554-840a2fe20603 + oidc_client_secret: ${{ inputs.oidc_client_secret }} + EOF + cat integ_config_vars.yml | jinja2 --strict tests/integration/integration_config.yml.j2 > tests/integration/integration_config.yml echo "sc_host: ${{ inputs.sc_host }}" >> tests/integration/integration_config.yml - echo "sc_username: ${{ inputs.sc_username }}" >> tests/integration/integration_config.yml - echo "sc_password: ${{ inputs.sc_password }}" >> tests/integration/integration_config.yml - echo "smb_password: ${{ inputs.smb_password }}" >> tests/integration/integration_config.yml - echo "sc_replication_dest_password: ${{ inputs.sc_replication_dest_password }}" >> tests/integration/integration_config.yml pwd ls -al tests/integration/integration_config.yml shell: bash diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 6250a159f..3d056f8a8 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -9,7 +9,7 @@ jobs: mypy: name: Type checks (mypy) runs-on: [ubuntu-latest] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 defaults: run: working-directory: ${{ env.WORKDIR }} @@ -26,7 +26,7 @@ jobs: docs: runs-on: [ubuntu-latest] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 defaults: run: working-directory: ${{ env.WORKDIR }} @@ -47,7 +47,7 @@ jobs: sanity-test: runs-on: [ubuntu-latest] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 defaults: run: working-directory: ${{ env.WORKDIR }} @@ -65,7 +65,7 @@ jobs: units-test: runs-on: [ubuntu-latest] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 defaults: run: working-directory: ${{ env.WORKDIR }} diff --git a/.github/workflows/integ-test.yml b/.github/workflows/integ-test.yml index 8cd492c6a..a0f227769 100644 --- a/.github/workflows/integ-test.yml +++ b/.github/workflows/integ-test.yml @@ -41,7 +41,7 @@ jobs: # to delay integ-test until integration-prepare-env finishes. integration-prepare-env: runs-on: [self-hosted2] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 env: ANSIBLE_COLLECTIONS_PATH: $GITHUB_WORKSPACE/work-dir defaults: @@ -64,10 +64,10 @@ jobs: with: ci_config_all: ${{ vars.CI_CONFIG_HC_IP50 }} sc_host: ${{ matrix.sc_host }} - sc_username: admin - sc_password: ${{ secrets.CI_CONFIG_HC_IP200_SC_PASSWORD }} + sc_username_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_USERNAME }} + sc_password_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_PASSWORD }} smb_password: ${{ secrets.CI_CONFIG_HC_IP50_SMB_PASSWORD }} - sc_replication_dest_password: ${{ secrets.CI_CONFIG_HC_IP50_SC_REPLICATION_DEST_PASSWORD }} + oidc_client_secret: ${{ secrets.OIDC_CLIENT_SECRET }} working_directory: ${{ env.WORKDIR }} - run: ansible-playbook tests/integration/prepare/prepare_iso.yml - run: ansible-playbook tests/integration/prepare/prepare_vm.yml @@ -76,7 +76,7 @@ jobs: integ-matrix: runs-on: [ubuntu-latest] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 defaults: run: working-directory: ${{ env.WORKDIR }} @@ -105,7 +105,7 @@ jobs: examples-matrix: runs-on: [ ubuntu-latest ] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 defaults: run: working-directory: ${{ env.WORKDIR }} @@ -133,7 +133,7 @@ jobs: needs: - examples-matrix runs-on: [ self-hosted2 ] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 env: ANSIBLE_COLLECTIONS_PATH: $GITHUB_WORKSPACE/work-dir DEBIAN_FRONTEND: noninteractive @@ -159,10 +159,10 @@ jobs: with: ci_config_all: ${{ vars.CI_CONFIG_HC_IP50 }} sc_host: https://10.5.11.200 - sc_username: admin - sc_password: ${{ secrets.CI_CONFIG_HC_IP200_SC_PASSWORD }} + sc_username_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_USERNAME }} + sc_password_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_PASSWORD }} smb_password: ${{ secrets.CI_CONFIG_HC_IP50_SMB_PASSWORD }} - sc_replication_dest_password: ${{ secrets.CI_CONFIG_HC_IP50_SC_REPLICATION_DEST_PASSWORD }} + oidc_client_secret: ${{ secrets.OIDC_CLIENT_SECRET }} working_directory: ${{ env.WORKDIR }} - run: | pwd @@ -171,8 +171,8 @@ jobs: - run: | eval export SC_HOST=$(cat tests/integration/integration_config.yml | yq '.sc_host') - eval export SC_USERNAME=$(cat tests/integration/integration_config.yml | yq '.sc_username') - eval export SC_PASSWORD=$(cat tests/integration/integration_config.yml | yq '.sc_password') + eval export SC_USERNAME=$(cat tests/integration/integration_config.yml | yq '.sc_config."https://10.5.11.200".sc_username') + eval export SC_PASSWORD=$(cat tests/integration/integration_config.yml | yq '.sc_config."https://10.5.11.200".sc_password') eval export SC_TIMEOUT=$(cat tests/integration/integration_config.yml | yq '.sc_timeout') ansible-playbook -i localhost, -e hypercore_example_check_mode=true examples/${{ matrix.example_name }} @@ -181,7 +181,7 @@ jobs: - integ-matrix # - units-test runs-on: [self-hosted2] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 env: DEBIAN_FRONTEND: noninteractive defaults: @@ -213,10 +213,10 @@ jobs: with: ci_config_all: ${{ vars.CI_CONFIG_HC_IP50 }} sc_host: ${{ matrix.sc_host }} - sc_username: admin - sc_password: ${{ secrets.CI_CONFIG_HC_IP200_SC_PASSWORD }} + sc_username_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_USERNAME }} + sc_password_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_PASSWORD }} smb_password: ${{ secrets.CI_CONFIG_HC_IP50_SMB_PASSWORD }} - sc_replication_dest_password: ${{ secrets.CI_CONFIG_HC_IP50_SC_REPLICATION_DEST_PASSWORD }} + oidc_client_secret: ${{ secrets.OIDC_CLIENT_SECRET }} working_directory: ${{ env.WORKDIR }} - run: ansible-test integration --local ${{ matrix.test_name }} @@ -225,7 +225,7 @@ jobs: needs: - integ runs-on: [self-hosted2] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 env: ANSIBLE_COLLECTIONS_PATH: $GITHUB_WORKSPACE/work-dir defaults: @@ -242,10 +242,10 @@ jobs: with: ci_config_all: ${{ vars.CI_CONFIG_HC_IP50 }} sc_host: https://10.5.11.200 - sc_username: admin - sc_password: ${{ secrets.CI_CONFIG_HC_IP200_SC_PASSWORD }} + sc_username_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_USERNAME }} + sc_password_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_PASSWORD }} smb_password: ${{ secrets.CI_CONFIG_HC_IP50_SMB_PASSWORD }} - sc_replication_dest_password: ${{ secrets.CI_CONFIG_HC_IP50_SC_REPLICATION_DEST_PASSWORD }} + oidc_client_secret: ${{ secrets.OIDC_CLIENT_SECRET }} working_directory: ${{ env.WORKDIR }} - run: ansible-galaxy collection install community.general - run: ansible-playbook tests/integration/cleanup/ci_replica_cleanup.yml @@ -254,7 +254,7 @@ jobs: needs: - integ runs-on: [self-hosted2] - container: quay.io/justinc1_github/scale_ci_integ:2 + container: quay.io/justinc1_github/scale_ci_integ:3 defaults: run: working-directory: ${{ env.WORKDIR }} @@ -268,10 +268,10 @@ jobs: with: ci_config_all: ${{ vars.CI_CONFIG_HC_IP50 }} sc_host: https://10.5.11.200 - sc_username: admin - sc_password: ${{ secrets.CI_CONFIG_HC_IP200_SC_PASSWORD }} + sc_username_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_USERNAME }} + sc_password_50: ${{ secrets.CI_CONFIG_HC_IP50_SC_PASSWORD }} smb_password: ${{ secrets.CI_CONFIG_HC_IP50_SMB_PASSWORD }} - sc_replication_dest_password: ${{ secrets.CI_CONFIG_HC_IP50_SC_REPLICATION_DEST_PASSWORD }} + oidc_client_secret: ${{ secrets.OIDC_CLIENT_SECRET }} working_directory: ${{ env.WORKDIR }} - run: | cd tests/integration/cleanup && ./smb_cleanup.sh \ diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 7883f08c1..075fa0f48 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -38,14 +38,23 @@ For integration tests we need to configure access to test cluster. Copy template and edit it: ```shell script -cp tests/integration/integration_config.yml.template tests/integration/integration_config.yml +cp tests/integration/integration_config.yml.j2 tests/integration/integration_config.yml nano tests/integration/integration_config.yml -# sample content +# Partial sample content cat tests/integration/integration_config.yml -sc_host: https://1.2.3.4 -sc_username: admin -sc_password: admin_pass +sc_config: + base_cfg: &base_cfg + time_server: + source: pool.ntp.org + time_zone: + zone: US/Eastern + ... + https://1.2.3.4: + <<: *base_cfg + sc_username: admin + sc_password: admin_pass + ... ``` # Development diff --git a/ci-infra/docker-image/Dockerfile b/ci-infra/docker-image/Dockerfile index b2e83f7d9..ccba219ad 100644 --- a/ci-infra/docker-image/Dockerfile +++ b/ci-infra/docker-image/Dockerfile @@ -14,6 +14,6 @@ RUN pip install --upgrade pip wheel COPY all.requirements /code/ci-infra/docker-image/ RUN pip install -r /code/ci-infra/docker-image/all.requirements && \ - pip install yq + pip install yq jinja2-cli RUN pip install ansible-core~=$ANSIBLE_CORE_VERSION diff --git a/ci-infra/docker-image/build.sh b/ci-infra/docker-image/build.sh index 16456669b..4bf6e052e 100755 --- a/ci-infra/docker-image/build.sh +++ b/ci-infra/docker-image/build.sh @@ -11,7 +11,7 @@ set -eux # Where to push images DOCKER_REGISTRY_REPO=quay.io/justinc1_github/scale_ci_integ # Tag to push -DOCKER_IMAGE_TAG=2 +DOCKER_IMAGE_TAG=3 DOCKER_CACHE="${DOCKER_CACHE:-n}" if [ "$DOCKER_CACHE" == "n" ] diff --git a/tests/integration/cleanup/ci_replica_cleanup.yml b/tests/integration/cleanup/ci_replica_cleanup.yml index 5736efe0c..bcf6d6b5e 100644 --- a/tests/integration/cleanup/ci_replica_cleanup.yml +++ b/tests/integration/cleanup/ci_replica_cleanup.yml @@ -7,14 +7,14 @@ gather_facts: false vars: replication_dest_cluster: - host: "{{ sc_replication_dest_host }}" - username: "{{ sc_replication_dest_username }}" - password: "{{ sc_replication_dest_password }}" + host: "{{ sc_config[sc_host].sc_replication_dest_host }}" + username: "{{ sc_config[sc_host].sc_replication_dest_username }}" + password: "{{ sc_config[sc_host].sc_replication_dest_password }}" timeout: "{{ sc_timeout }}" replication_src_cluster: host: "{{ sc_host }}" - username: "{{ sc_username }}" - password: "{{ sc_password }}" + username: "{{ sc_config[sc_host].sc_username }}" + password: "{{ sc_config[sc_host].sc_password }}" timeout: "{{ sc_timeout }}" vars_files: - ../integration_config.yml diff --git a/tests/integration/integration_config.yml.j2 b/tests/integration/integration_config.yml.j2 new file mode 100644 index 000000000..7c2073056 --- /dev/null +++ b/tests/integration/integration_config.yml.j2 @@ -0,0 +1,110 @@ +--- +# ansible-test integration_config.yml +# This file is jinja2 template for github CI. +# It will be rendered to plain yml before ansible uses it. +# For CI testing we have: +# - real hardware nodes +# - virtual nodes (VSNS) + +# Select SC_HOST to be used +# sc_host: https://10.5.11.50 + +sc_timeout: 60.0 +smb_server: "{{ smb_server }}" +smb_share: "{{ smb_share }}" +smb_username: "{{ smb_username }}" +smb_password: "{{ smb_password }}" + +# sc_config is specific for each test cluster +# The values should be set after tests, to ensure cluster is left in functional state. +sc_config: + + base_cfg: &base_cfg + # desired configuration after tests are done + time_server: + source: pool.ntp.org + time_zone: + zone: US/Eastern + dns_config: + dns_servers: + - 1.1.1.1 + - 1.0.0.1 + search_domains: [] + registration: + company_name: Scale Computing + contact: Alex Nicholson + email: email_hidden@scalecomputing.com + phone: "123 456 7890" + smtp: &base_smtp + host: smtp-relay.gmail.com + port: 25 + use_ssl: false + # from_address: PUB5@scalecomputing.com + use_auth: false + auth_user: "" + auth_password: "" + email_alert: + - email_hidden@scalecomputing.com + oidc: + client_id_default: "{{ oidc_client_id }}" + shared_secret_default: "{{ oidc_client_secret }}" + config_url_default: https://login.microsoftonline.com/76d4c62a-a9ca-4dc2-9187-e2cc4d9abe7f/v2.0/.well-known/openid-configuration + scopes: "openid+profile" + client_id_test: ci-client-id + shared_secret_test: ci-client-secret + config_url_test: https://login.microsoftonline.com/76d4c62a-a9ca-4dc2-9187-e2cc4d9abe7f/v2.0/.well-known/openid-configuration + cluster_shutdown: + magic_allow_string: "oh-no-no" # use "allow-cluster-shutdown-test" to allow this integration test + version_update: + magic_allow_string: "oh-no-no" # use "allow-version-update-test" to allow this integration test + syslog_server: + host: 10.5.11.222 + + https://10.5.11.50: + <<: *base_cfg + sc_username: "{{ sc_username_50 }}" + sc_password: "{{ sc_password_50 }}" + # Only .50 is configured with remote replication. + sc_replication_dest_host: https://10.5.11.60 + # We have same username on .50 and .60 node. + sc_replication_dest_username: "{{ sc_username_50 }}" + sc_replication_dest_password: "{{ sc_password_50 }}" + # desired configuration after tests are done + cluster: + name: PUB5 + support_tunnel: + open: true + code: "4422" + smtp: + <<: *base_smtp + from_address: PUB5@scalecomputing.com + + https://10.5.11.200: + <<: *base_cfg + sc_username: admin + sc_password: admin + cluster: + name: VSNS200 + support_tunnel: + open: true + code: "4423" + smtp: + <<: *base_smtp + from_address: VSNS200@scalecomputing.com + syslog_server: + host: 10.5.11.222 + + https://10.5.11.201: + <<: *base_cfg + sc_username: admin + sc_password: admin + cluster: + name: VSNS201 + support_tunnel: + open: true + code: "4424" + smtp: + <<: *base_smtp + from_address: VSNS201@scalecomputing.com + syslog_server: + host: 10.5.11.222 diff --git a/tests/integration/integration_config.yml.template b/tests/integration/integration_config.yml.template deleted file mode 100644 index f098bbe2e..000000000 --- a/tests/integration/integration_config.yml.template +++ /dev/null @@ -1,65 +0,0 @@ -# Replace the values to suit you CI environment -sc_host: -sc_username: -sc_password: -# Seems on loaded API higher timeout is needed -sc_timeout: 60 -# CI tests for vm_import/vm_export require a SMB server -smb_server: -smb_share: -# Provide username as "domain;username" or only ";username". -smb_username: -smb_password: -# Replication cluster needs to be cleaned up. -sc_replication_dest_host: -sc_replication_dest_username: -sc_replication_dest_password: - -# sc_config is specific for each test cluster -# The values should be set after tests, to ensure cluster is left in functional state. -sc_config: - base_cfg: &base_cfg - time_server: - source: pool.ntp.org - time_zone: - zone: US/Eastern - dns_config: - dns_servers: - - 1.1.1.1 - - 1.0.0.1 - search_domains: [] - registration: - company_name: Scale Computing - contact: - email: someone@scalecomputing.com - phone: "123 456 7890" - cluster_shutdown: - magic_allow_string: "oh-no-no" # use "allow-cluster-shutdown-test" to allow this integration test - version_update: - magic_allow_string: "oh-no-no" # use "allow-version-update-test" to allow this integration test - syslog_server: - host: 1.2.3.4 - : - <<: *base_cfg - cluster: - name: PUBx - support_tunnel: - open: true - code: "4422" - smtp: - host: smtp-relay.gmail.com - port: 25 - use_ssl: false - from_address: PUBx@scalecomputing.com - auth_user: "" - auth_password: "" - oidc: - client_id_default: - shared_secret_default: - config_url_default: - scopes: "openid+profile" - client_id_test: - shared_secret_test: - config_url_test: - email_alert: - - someone@scalecomputing.com diff --git a/tests/integration/prepare/prepare_examples.yml b/tests/integration/prepare/prepare_examples.yml index cd91d7023..ffa6d0bb4 100644 --- a/tests/integration/prepare/prepare_examples.yml +++ b/tests/integration/prepare/prepare_examples.yml @@ -5,8 +5,8 @@ vars: cluster_instance: host: "{{ sc_host }}" - username: "{{ sc_username }}" - password: "{{ sc_password }}" + username: "{{ sc_config[sc_host].sc_username }}" + password: "{{ sc_config[sc_host].sc_password }}" timeout: "{{ sc_timeout }}" vars_files: - ../integration_config.yml diff --git a/tests/integration/prepare/prepare_iso.yml b/tests/integration/prepare/prepare_iso.yml index 61aa6b242..308d22446 100644 --- a/tests/integration/prepare/prepare_iso.yml +++ b/tests/integration/prepare/prepare_iso.yml @@ -5,14 +5,14 @@ # environment: # # didn't work # SC_HOST: "{{ sc_host }}" -# SC_USERNAME: "{{ sc_username }}" -# SC_PASSWORD: "{{ sc_password }}" +# SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" +# SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" # SC_TIMEOUT: "{{ sc_timeout }}" vars: cluster_instance: host: "{{ sc_host }}" - username: "{{ sc_username }}" - password: "{{ sc_password }}" + username: "{{ sc_config[sc_host].sc_username }}" + password: "{{ sc_config[sc_host].sc_password }}" timeout: "{{ sc_timeout }}" vars_files: - ../integration_config.yml diff --git a/tests/integration/prepare/prepare_vm.yml b/tests/integration/prepare/prepare_vm.yml index f3ade9a20..13ef44ac7 100644 --- a/tests/integration/prepare/prepare_vm.yml +++ b/tests/integration/prepare/prepare_vm.yml @@ -5,8 +5,8 @@ vars: cluster_instance: host: "{{ sc_host }}" - username: "{{ sc_username }}" - password: "{{ sc_password }}" + username: "{{ sc_config[sc_host].sc_username }}" + password: "{{ sc_config[sc_host].sc_password }}" timeout: "{{ sc_timeout }}" vars_files: - ../integration_config.yml diff --git a/tests/integration/targets/api/tasks/main.yml b/tests/integration/targets/api/tasks/main.yml index 669c8a66a..ba9738d11 100644 --- a/tests/integration/targets/api/tasks/main.yml +++ b/tests/integration/targets/api/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/certificate/tasks/01_normal.yml b/tests/integration/targets/certificate/tasks/01_normal.yml index db1e11032..b4da32063 100644 --- a/tests/integration/targets/certificate/tasks/01_normal.yml +++ b/tests/integration/targets/certificate/tasks/01_normal.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" connection: local diff --git a/tests/integration/targets/certificate/tasks/02_ssl_eof_error.yml b/tests/integration/targets/certificate/tasks/02_ssl_eof_error.yml index 4f5b1ccb7..35bfc9e8f 100644 --- a/tests/integration/targets/certificate/tasks/02_ssl_eof_error.yml +++ b/tests/integration/targets/certificate/tasks/02_ssl_eof_error.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" connection: local diff --git a/tests/integration/targets/certificate/tasks/main.yml b/tests/integration/targets/certificate/tasks/main.yml index 90baf53ff..9dccd69e9 100644 --- a/tests/integration/targets/certificate/tasks/main.yml +++ b/tests/integration/targets/certificate/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/cluster_info/tasks/main.yml b/tests/integration/targets/cluster_info/tasks/main.yml index 25abcc5c3..e5031b81e 100644 --- a/tests/integration/targets/cluster_info/tasks/main.yml +++ b/tests/integration/targets/cluster_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/cluster_name/tasks/main.yml b/tests/integration/targets/cluster_name/tasks/main.yml index f9d9b52c9..7c2398b7c 100644 --- a/tests/integration/targets/cluster_name/tasks/main.yml +++ b/tests/integration/targets/cluster_name/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: cluster_config: "{{ sc_config[sc_host].cluster }}" diff --git a/tests/integration/targets/cluster_shutdown/tasks/main.yml b/tests/integration/targets/cluster_shutdown/tasks/main.yml index 62aafa966..e407d7beb 100644 --- a/tests/integration/targets/cluster_shutdown/tasks/main.yml +++ b/tests/integration/targets/cluster_shutdown/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: cluster_shutdown_config: "{{ sc_config[sc_host].cluster_shutdown }}" diff --git a/tests/integration/targets/dns_config/tasks/main.yml b/tests/integration/targets/dns_config/tasks/main.yml index 9afcffda9..c4c30e3be 100644 --- a/tests/integration/targets/dns_config/tasks/main.yml +++ b/tests/integration/targets/dns_config/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/email_alert/tasks/01_email_alert_info.yml b/tests/integration/targets/email_alert/tasks/01_email_alert_info.yml index eb12c83d3..60078bb53 100644 --- a/tests/integration/targets/email_alert/tasks/01_email_alert_info.yml +++ b/tests/integration/targets/email_alert/tasks/01_email_alert_info.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" block: - name: Retrieve info about Email alert recipients diff --git a/tests/integration/targets/email_alert/tasks/02_email_alert.yml b/tests/integration/targets/email_alert/tasks/02_email_alert.yml index b431e98b5..4f6206e92 100644 --- a/tests/integration/targets/email_alert/tasks/02_email_alert.yml +++ b/tests/integration/targets/email_alert/tasks/02_email_alert.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" vars: new_email: new@test.com diff --git a/tests/integration/targets/email_alert/tasks/main.yml b/tests/integration/targets/email_alert/tasks/main.yml index ed0c8de52..f32d2ac10 100644 --- a/tests/integration/targets/email_alert/tasks/main.yml +++ b/tests/integration/targets/email_alert/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: email_alert_config: "{{ sc_config[sc_host].email_alert }}" diff --git a/tests/integration/targets/git_issue_11/tasks/main.yml b/tests/integration/targets/git_issue_11/tasks/main.yml index ebbc213e9..73d285fcb 100644 --- a/tests/integration/targets/git_issue_11/tasks/main.yml +++ b/tests/integration/targets/git_issue_11/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/git_issue_12/tasks/main.yml b/tests/integration/targets/git_issue_12/tasks/main.yml index 96c1b96d8..49956254d 100644 --- a/tests/integration/targets/git_issue_12/tasks/main.yml +++ b/tests/integration/targets/git_issue_12/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/git_issue_15/tasks/main.yml b/tests/integration/targets/git_issue_15/tasks/main.yml index bcf8f8a61..4eafbabe4 100644 --- a/tests/integration/targets/git_issue_15/tasks/main.yml +++ b/tests/integration/targets/git_issue_15/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/git_issue_3/tasks/main.yml b/tests/integration/targets/git_issue_3/tasks/main.yml index 19c22233c..6f310713e 100644 --- a/tests/integration/targets/git_issue_3/tasks/main.yml +++ b/tests/integration/targets/git_issue_3/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/git_issue_4/tasks/main.yml b/tests/integration/targets/git_issue_4/tasks/main.yml index 870736a32..75a669899 100644 --- a/tests/integration/targets/git_issue_4/tasks/main.yml +++ b/tests/integration/targets/git_issue_4/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/git_issue_41/tasks/main.yml b/tests/integration/targets/git_issue_41/tasks/main.yml index 5d08891ff..fff31fd99 100644 --- a/tests/integration/targets/git_issue_41/tasks/main.yml +++ b/tests/integration/targets/git_issue_41/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/git_issue_50/tasks/main.yml b/tests/integration/targets/git_issue_50/tasks/main.yml index 1cd8deaf9..28b0ad599 100644 --- a/tests/integration/targets/git_issue_50/tasks/main.yml +++ b/tests/integration/targets/git_issue_50/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/git_issue_60/tasks/issue_60_timeout.yml b/tests/integration/targets/git_issue_60/tasks/issue_60_timeout.yml index 2271af213..845341617 100644 --- a/tests/integration/targets/git_issue_60/tasks/issue_60_timeout.yml +++ b/tests/integration/targets/git_issue_60/tasks/issue_60_timeout.yml @@ -50,8 +50,8 @@ scale_computing.hypercore.vm_info: cluster_instance: host: "{{ sc_host }}" - username: "{{ sc_username }}" - password: "{{ sc_password }}" + username: "{{ sc_config[sc_host].sc_username }}" + password: "{{ sc_config[sc_host].sc_password }}" timeout: 10 vm_name: XLAB-timeout-test register: source_info @@ -64,8 +64,8 @@ scale_computing.hypercore.vm_info: cluster_instance: host: "{{ sc_host }}" - username: "{{ sc_username }}" - password: "{{ sc_password }}" + username: "{{ sc_config[sc_host].sc_username }}" + password: "{{ sc_config[sc_host].sc_password }}" timeout: 0.000001 # This should "force" a timeout vm_name: XLAB-timeout-test register: source_info diff --git a/tests/integration/targets/git_issue_60/tasks/main.yml b/tests/integration/targets/git_issue_60/tasks/main.yml index 837c2a40e..df1563e0d 100644 --- a/tests/integration/targets/git_issue_60/tasks/main.yml +++ b/tests/integration/targets/git_issue_60/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/git_issue_7/tasks/main.yml b/tests/integration/targets/git_issue_7/tasks/main.yml index 85feadc2e..bd04956cc 100644 --- a/tests/integration/targets/git_issue_7/tasks/main.yml +++ b/tests/integration/targets/git_issue_7/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/i_vm_params/tasks/check_mode.yml b/tests/integration/targets/i_vm_params/tasks/check_mode.yml index 8ba512c2a..3251b070d 100644 --- a/tests/integration/targets/i_vm_params/tasks/check_mode.yml +++ b/tests/integration/targets/i_vm_params/tasks/check_mode.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/i_vm_params/tasks/main.yml b/tests/integration/targets/i_vm_params/tasks/main.yml index e99a5450c..3c448dc30 100644 --- a/tests/integration/targets/i_vm_params/tasks/main.yml +++ b/tests/integration/targets/i_vm_params/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/inventory/cleanup.yml b/tests/integration/targets/inventory/cleanup.yml index be2546b30..863c49066 100644 --- a/tests/integration/targets/inventory/cleanup.yml +++ b/tests/integration/targets/inventory/cleanup.yml @@ -4,8 +4,8 @@ gather_facts: False environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" tasks: - name: List all VMs diff --git a/tests/integration/targets/inventory/prepare.yml b/tests/integration/targets/inventory/prepare.yml index a07d6285e..6b3a8750a 100644 --- a/tests/integration/targets/inventory/prepare.yml +++ b/tests/integration/targets/inventory/prepare.yml @@ -5,8 +5,8 @@ gather_facts: False environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" vars: vm_data_doms: diff --git a/tests/integration/targets/inventory/run_ansible_both_false_tests.yml b/tests/integration/targets/inventory/run_ansible_both_false_tests.yml index 2a9016f06..8f065bcdf 100644 --- a/tests/integration/targets/inventory/run_ansible_both_false_tests.yml +++ b/tests/integration/targets/inventory/run_ansible_both_false_tests.yml @@ -4,8 +4,8 @@ gather_facts: False environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" tasks: - block: diff --git a/tests/integration/targets/inventory/run_ansible_both_true_tests.yml b/tests/integration/targets/inventory/run_ansible_both_true_tests.yml index 5adcad87a..ca5cf4981 100644 --- a/tests/integration/targets/inventory/run_ansible_both_true_tests.yml +++ b/tests/integration/targets/inventory/run_ansible_both_true_tests.yml @@ -4,8 +4,8 @@ gather_facts: False environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" tasks: - block: diff --git a/tests/integration/targets/inventory/run_ansible_disable_tests.yml b/tests/integration/targets/inventory/run_ansible_disable_tests.yml index 4d06f8081..31b79ade5 100644 --- a/tests/integration/targets/inventory/run_ansible_disable_tests.yml +++ b/tests/integration/targets/inventory/run_ansible_disable_tests.yml @@ -4,8 +4,8 @@ gather_facts: False environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" tasks: - block: diff --git a/tests/integration/targets/inventory/run_ansible_enable_tests.yml b/tests/integration/targets/inventory/run_ansible_enable_tests.yml index fd036bb07..569e7929f 100644 --- a/tests/integration/targets/inventory/run_ansible_enable_tests.yml +++ b/tests/integration/targets/inventory/run_ansible_enable_tests.yml @@ -4,8 +4,8 @@ gather_facts: False environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" tasks: diff --git a/tests/integration/targets/iso/tasks/main.yml b/tests/integration/targets/iso/tasks/main.yml index 32a2c4ebc..7a02ffa62 100644 --- a/tests/integration/targets/iso/tasks/main.yml +++ b/tests/integration/targets/iso/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/node_info/tasks/main.yml b/tests/integration/targets/node_info/tasks/main.yml index 5ef4d325b..bf28d1578 100644 --- a/tests/integration/targets/node_info/tasks/main.yml +++ b/tests/integration/targets/node_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/oidc_config/tasks/main.yml b/tests/integration/targets/oidc_config/tasks/main.yml index 37d8f211f..abb3a865a 100644 --- a/tests/integration/targets/oidc_config/tasks/main.yml +++ b/tests/integration/targets/oidc_config/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/registration/tasks/main.yml b/tests/integration/targets/registration/tasks/main.yml index a6f04cfbd..e94a7a4d4 100644 --- a/tests/integration/targets/registration/tasks/main.yml +++ b/tests/integration/targets/registration/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: diff --git a/tests/integration/targets/remote_cluster_info/tasks/main.yml b/tests/integration/targets/remote_cluster_info/tasks/main.yml index b610060c6..911452286 100644 --- a/tests/integration/targets/remote_cluster_info/tasks/main.yml +++ b/tests/integration/targets/remote_cluster_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/role_check_local_time/tasks/main.yml b/tests/integration/targets/role_check_local_time/tasks/main.yml index d7853265b..07d35f619 100644 --- a/tests/integration/targets/role_check_local_time/tasks/main.yml +++ b/tests/integration/targets/role_check_local_time/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/role_cluster_config/tasks/main.yml b/tests/integration/targets/role_cluster_config/tasks/main.yml index c5ec6fe81..4c1f80e44 100644 --- a/tests/integration/targets/role_cluster_config/tasks/main.yml +++ b/tests/integration/targets/role_cluster_config/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: diff --git a/tests/integration/targets/role_version_update_single_node/tasks/main.yml b/tests/integration/targets/role_version_update_single_node/tasks/main.yml index 38a8b539a..7ed8fcf21 100644 --- a/tests/integration/targets/role_version_update_single_node/tasks/main.yml +++ b/tests/integration/targets/role_version_update_single_node/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: diff --git a/tests/integration/targets/smtp/tasks/main.yml b/tests/integration/targets/smtp/tasks/main.yml index 6e6d02f82..95936a661 100644 --- a/tests/integration/targets/smtp/tasks/main.yml +++ b/tests/integration/targets/smtp/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/snapshot_schedule/tasks/main.yml b/tests/integration/targets/snapshot_schedule/tasks/main.yml index fafb65f5d..387a80730 100644 --- a/tests/integration/targets/snapshot_schedule/tasks/main.yml +++ b/tests/integration/targets/snapshot_schedule/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/support_tunnel/tasks/main.yml b/tests/integration/targets/support_tunnel/tasks/main.yml index 625937197..61ea13880 100644 --- a/tests/integration/targets/support_tunnel/tasks/main.yml +++ b/tests/integration/targets/support_tunnel/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: code: 4422 diff --git a/tests/integration/targets/support_tunnel_info/tasks/main.yml b/tests/integration/targets/support_tunnel_info/tasks/main.yml index 231516407..ae81fa66c 100644 --- a/tests/integration/targets/support_tunnel_info/tasks/main.yml +++ b/tests/integration/targets/support_tunnel_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/syslog_server/tasks/01_syslog_server_info.yml b/tests/integration/targets/syslog_server/tasks/01_syslog_server_info.yml index 01d78f597..5b3510d43 100644 --- a/tests/integration/targets/syslog_server/tasks/01_syslog_server_info.yml +++ b/tests/integration/targets/syslog_server/tasks/01_syslog_server_info.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" vars: # payload to be POST-ed to api syslog_server_config_5: diff --git a/tests/integration/targets/syslog_server/tasks/02_syslog_server.yml b/tests/integration/targets/syslog_server/tasks/02_syslog_server.yml index 3f1f85681..84786c27e 100644 --- a/tests/integration/targets/syslog_server/tasks/02_syslog_server.yml +++ b/tests/integration/targets/syslog_server/tasks/02_syslog_server.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" vars: default_port: 514 diff --git a/tests/integration/targets/syslog_server/tasks/main.yml b/tests/integration/targets/syslog_server/tasks/main.yml index 379e2ca3f..622ca8542 100644 --- a/tests/integration/targets/syslog_server/tasks/main.yml +++ b/tests/integration/targets/syslog_server/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" vars: syslog_server_config: "{{ sc_config[sc_host].syslog_server }}" diff --git a/tests/integration/targets/time_server/tasks/01_time_server_info.yml b/tests/integration/targets/time_server/tasks/01_time_server_info.yml index 6aef6087c..06bba6121 100644 --- a/tests/integration/targets/time_server/tasks/01_time_server_info.yml +++ b/tests/integration/targets/time_server/tasks/01_time_server_info.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" vars: actual_uuid: "timesource_guid" diff --git a/tests/integration/targets/time_server/tasks/02_time_server.yml b/tests/integration/targets/time_server/tasks/02_time_server.yml index a5e99107a..e950ac167 100644 --- a/tests/integration/targets/time_server/tasks/02_time_server.yml +++ b/tests/integration/targets/time_server/tasks/02_time_server.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout * 10 }}" vars: time_server_a: 2.pool.ntp.org diff --git a/tests/integration/targets/time_server/tasks/main.yml b/tests/integration/targets/time_server/tasks/main.yml index e2962b345..63c641ad9 100644 --- a/tests/integration/targets/time_server/tasks/main.yml +++ b/tests/integration/targets/time_server/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" # TODO - the time_server module needs to use longer timeout by default SC_TIMEOUT: "{{ sc_timeout }}" diff --git a/tests/integration/targets/time_zone/tasks/01_time_zone_info.yml b/tests/integration/targets/time_zone/tasks/01_time_zone_info.yml index 172126231..738d50957 100644 --- a/tests/integration/targets/time_zone/tasks/01_time_zone_info.yml +++ b/tests/integration/targets/time_zone/tasks/01_time_zone_info.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" vars: actual_uuid: "timezone_guid" diff --git a/tests/integration/targets/time_zone/tasks/02_time_zone.yml b/tests/integration/targets/time_zone/tasks/02_time_zone.yml index c13096248..f8120501c 100644 --- a/tests/integration/targets/time_zone/tasks/02_time_zone.yml +++ b/tests/integration/targets/time_zone/tasks/02_time_zone.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" vars: time_zone_a: "Europe/Ljubljana" diff --git a/tests/integration/targets/time_zone/tasks/main.yml b/tests/integration/targets/time_zone/tasks/main.yml index 9b5b02c6d..99c169cb3 100644 --- a/tests/integration/targets/time_zone/tasks/main.yml +++ b/tests/integration/targets/time_zone/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/user/tasks/main.yml b/tests/integration/targets/user/tasks/main.yml index bc5e26ced..464c202ba 100644 --- a/tests/integration/targets/user/tasks/main.yml +++ b/tests/integration/targets/user/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/user_info/tasks/main.yml b/tests/integration/targets/user_info/tasks/main.yml index c57827014..fc766b2dc 100644 --- a/tests/integration/targets/user_info/tasks/main.yml +++ b/tests/integration/targets/user_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/version_update/tasks/main.yml b/tests/integration/targets/version_update/tasks/main.yml index 6a30400ef..3b97caba4 100644 --- a/tests/integration/targets/version_update/tasks/main.yml +++ b/tests/integration/targets/version_update/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: cluster_update_config: "{{ sc_config[sc_host].version_update }}" diff --git a/tests/integration/targets/version_update_info/tasks/main.yml b/tests/integration/targets/version_update_info/tasks/main.yml index a7e474417..2d3dce919 100644 --- a/tests/integration/targets/version_update_info/tasks/main.yml +++ b/tests/integration/targets/version_update_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/version_update_status_info/tasks/main.yml b/tests/integration/targets/version_update_status_info/tasks/main.yml index 232abf7ef..e20189245 100644 --- a/tests/integration/targets/version_update_status_info/tasks/main.yml +++ b/tests/integration/targets/version_update_status_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/virtual_disk/tasks/main.yml b/tests/integration/targets/virtual_disk/tasks/main.yml index b278fd95e..d879130ce 100644 --- a/tests/integration/targets/virtual_disk/tasks/main.yml +++ b/tests/integration/targets/virtual_disk/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: expected_virtual_disk_replication_factors: diff --git a/tests/integration/targets/virtual_disk_info/tasks/main.yml b/tests/integration/targets/virtual_disk_info/tasks/main.yml index 6cdee06cc..fbe1d85e6 100644 --- a/tests/integration/targets/virtual_disk_info/tasks/main.yml +++ b/tests/integration/targets/virtual_disk_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: image_filename: "ci-test-virtual-disk-1.qcow2" diff --git a/tests/integration/targets/vm/tasks/01_main.yml b/tests/integration/targets/vm/tasks/01_main.yml index ad56e3c93..2db815b04 100644 --- a/tests/integration/targets/vm/tasks/01_main.yml +++ b/tests/integration/targets/vm/tasks/01_main.yml @@ -3,8 +3,8 @@ # The main vm test was devided into smaller tests for sake of synchronous testing. - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: iso_name: "Porteus-XFCE-v5.0-x86_64.iso" diff --git a/tests/integration/targets/vm/tasks/02_shutdown.yml b/tests/integration/targets/vm/tasks/02_shutdown.yml index 5f9f480ba..5c6bed287 100644 --- a/tests/integration/targets/vm/tasks/02_shutdown.yml +++ b/tests/integration/targets/vm/tasks/02_shutdown.yml @@ -5,8 +5,8 @@ # We should test correct force shutdown too. - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: # ISO has no APCI diff --git a/tests/integration/targets/vm/tasks/03_rename.yml b/tests/integration/targets/vm/tasks/03_rename.yml index 9fd14a231..c3a23e6ce 100644 --- a/tests/integration/targets/vm/tasks/03_rename.yml +++ b/tests/integration/targets/vm/tasks/03_rename.yml @@ -2,8 +2,8 @@ # This is a part of the vm module; testing vm rename (vm_name and vm_name_new params) - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: vm_name_a: "vm-rename-test-a" diff --git a/tests/integration/targets/vm/tasks/main.yml b/tests/integration/targets/vm/tasks/main.yml index 8642a2970..51d13ff6d 100644 --- a/tests/integration/targets/vm/tasks/main.yml +++ b/tests/integration/targets/vm/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm__rename/tasks/main.yml b/tests/integration/targets/vm__rename/tasks/main.yml index 817107015..7aa4c135f 100644 --- a/tests/integration/targets/vm__rename/tasks/main.yml +++ b/tests/integration/targets/vm__rename/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm__shutdown_with_acpi/tasks/main.yml b/tests/integration/targets/vm__shutdown_with_acpi/tasks/main.yml index 1c8596cac..a6f86ee19 100644 --- a/tests/integration/targets/vm__shutdown_with_acpi/tasks/main.yml +++ b/tests/integration/targets/vm__shutdown_with_acpi/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm__shutdown_without_acpi/tasks/main.yml b/tests/integration/targets/vm__shutdown_without_acpi/tasks/main.yml index 5227484f3..32bd21f94 100644 --- a/tests/integration/targets/vm__shutdown_without_acpi/tasks/main.yml +++ b/tests/integration/targets/vm__shutdown_without_acpi/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_boot_devices/tasks/main.yml b/tests/integration/targets/vm_boot_devices/tasks/main.yml index 588ff7caf..ad78e0810 100644 --- a/tests/integration/targets/vm_boot_devices/tasks/main.yml +++ b/tests/integration/targets/vm_boot_devices/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_clone/tasks/main.yml b/tests/integration/targets/vm_clone/tasks/main.yml index 05529cfef..faa8dfd07 100644 --- a/tests/integration/targets/vm_clone/tasks/main.yml +++ b/tests/integration/targets/vm_clone/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_disk/tasks/main.yml b/tests/integration/targets/vm_disk/tasks/main.yml index 54279fdf7..e179d50c3 100644 --- a/tests/integration/targets/vm_disk/tasks/main.yml +++ b/tests/integration/targets/vm_disk/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_export/tasks/main.yml b/tests/integration/targets/vm_export/tasks/main.yml index d9711e146..56c2befa7 100644 --- a/tests/integration/targets/vm_export/tasks/main.yml +++ b/tests/integration/targets/vm_export/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_import/tasks/main.yml b/tests/integration/targets/vm_import/tasks/main.yml index 0ad12f364..c3697de14 100644 --- a/tests/integration/targets/vm_import/tasks/main.yml +++ b/tests/integration/targets/vm_import/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_nic/tasks/main.yml b/tests/integration/targets/vm_nic/tasks/main.yml index 1f8b543aa..bc6b59a7e 100644 --- a/tests/integration/targets/vm_nic/tasks/main.yml +++ b/tests/integration/targets/vm_nic/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_nic_info/tasks/main.yml b/tests/integration/targets/vm_nic_info/tasks/main.yml index d6de60764..09be8be42 100644 --- a/tests/integration/targets/vm_nic_info/tasks/main.yml +++ b/tests/integration/targets/vm_nic_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: diff --git a/tests/integration/targets/vm_node_affinity/tasks/check_mode.yml b/tests/integration/targets/vm_node_affinity/tasks/check_mode.yml index a7ff7b69c..2de0a687a 100644 --- a/tests/integration/targets/vm_node_affinity/tasks/check_mode.yml +++ b/tests/integration/targets/vm_node_affinity/tasks/check_mode.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_node_affinity/tasks/main.yml b/tests/integration/targets/vm_node_affinity/tasks/main.yml index 536696136..f322906ed 100644 --- a/tests/integration/targets/vm_node_affinity/tasks/main.yml +++ b/tests/integration/targets/vm_node_affinity/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_replication/tasks/main.yml b/tests/integration/targets/vm_replication/tasks/main.yml index 2bbd779fb..7201290d4 100644 --- a/tests/integration/targets/vm_replication/tasks/main.yml +++ b/tests/integration/targets/vm_replication/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" block: diff --git a/tests/integration/targets/vm_replication_info/tasks/main.yml b/tests/integration/targets/vm_replication_info/tasks/main.yml index 3457b2b2c..54cb5f719 100644 --- a/tests/integration/targets/vm_replication_info/tasks/main.yml +++ b/tests/integration/targets/vm_replication_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: vm_name_0: XLAB-vm_replication_info_CI_test diff --git a/tests/integration/targets/vm_snapshot/tasks/main.yml b/tests/integration/targets/vm_snapshot/tasks/main.yml index 6a50caa64..7dfab4aca 100644 --- a/tests/integration/targets/vm_snapshot/tasks/main.yml +++ b/tests/integration/targets/vm_snapshot/tasks/main.yml @@ -1,8 +1,8 @@ --- - environment: SC_HOST: "{{ sc_host }}" - SC_USERNAME: "{{ sc_username }}" - SC_PASSWORD: "{{ sc_password }}" + SC_USERNAME: "{{ sc_config[sc_host].sc_username }}" + SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}" SC_TIMEOUT: "{{ sc_timeout }}" vars: