diff options
| author | Jordan Borean <jborean93@gmail.com> | 2020-11-19 19:54:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 19:54:40 +0100 |
| commit | fb092a82a1a013fd38a37b90b305fc9a8fa11a13 (patch) | |
| tree | 3f43ec050441cdc230224fee2a5a1209865d08e7 /test/lib | |
| parent | Move progress messages into `_display_progress` CM (diff) | |
| download | ansible-fb092a82a1a013fd38a37b90b305fc9a8fa11a13.tar.xz ansible-fb092a82a1a013fd38a37b90b305fc9a8fa11a13.zip | |
ansible-galaxy - source deps from all servers and not just parent (#72576)
* ansible-galaxy - source deps from all servers and not just parent
* Added integration tests for this scenario
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/ansible_test/_internal/cloud/galaxy.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/lib/ansible_test/_internal/cloud/galaxy.py b/test/lib/ansible_test/_internal/cloud/galaxy.py index b524078c23..c045a362c4 100644 --- a/test/lib/ansible_test/_internal/cloud/galaxy.py +++ b/test/lib/ansible_test/_internal/cloud/galaxy.py @@ -238,16 +238,14 @@ class GalaxyEnvironment(CloudEnvironment): ansible_vars=dict( pulp_user=pulp_user, pulp_password=pulp_password, - pulp_v2_server='http://%s:%s/pulp_ansible/galaxy/published/api/' % (pulp_host, pulp_port), - pulp_v3_server='http://%s:%s/pulp_ansible/galaxy/published/api/' % (pulp_host, pulp_port), pulp_api='http://%s:%s' % (pulp_host, pulp_port), + pulp_server='http://%s:%s/pulp_ansible/galaxy/' % (pulp_host, pulp_port), galaxy_ng_server='http://%s:%s/api/galaxy/' % (pulp_host, galaxy_port), ), env_vars=dict( PULP_USER=pulp_user, PULP_PASSWORD=pulp_password, - PULP_V2_SERVER='http://%s:%s/pulp_ansible/galaxy/published/api/' % (pulp_host, pulp_port), - PULP_V3_SERVER='http://%s:%s/pulp_ansible/galaxy/published/api/' % (pulp_host, pulp_port), + PULP_SERVER='http://%s:%s/pulp_ansible/galaxy/api/' % (pulp_host, pulp_port), GALAXY_NG_SERVER='http://%s:%s/api/galaxy/' % (pulp_host, galaxy_port), ), ) |