diff options
| author | John R Barker <john@johnrbarker.com> | 2017-01-09 17:21:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-09 17:21:04 +0000 |
| commit | fb3bef7f46be78d4ff99466085ebcaac9120df48 (patch) | |
| tree | da4740fd4c20f1a1a641f6634f4c5f2b120b5ca5 /test/integration/targets/asa_config | |
| parent | a2b4ad9da0b64d61cb21b3b33a3b37ee1e87ef83 (diff) | |
| download | ansible-fb3bef7f46be78d4ff99466085ebcaac9120df48.tar.gz | |
Use inventory_hostname_short (#20054)
When using AWS we have to use the full domain name in the inventory file, which
we rather than the short name. This change avoids that ending up being
set in the tests.
Diffstat (limited to 'test/integration/targets/asa_config')
5 files changed, 6 insertions, 6 deletions
diff --git a/test/integration/targets/asa_config/tests/cli/backup.yaml b/test/integration/targets/asa_config/tests/cli/backup.yaml index eea8a94cd3..39f53d3b5c 100644 --- a/test/integration/targets/asa_config/tests/cli/backup.yaml +++ b/test/integration/targets/asa_config/tests/cli/backup.yaml @@ -11,7 +11,7 @@ - name: collect any backup files find: paths: "{{ role_path }}/backup" - pattern: "{{ inventory_hostname }}_config*" + pattern: "{{ inventory_hostname_short }}_config*" register: backup_files delegate_to: localhost @@ -36,7 +36,7 @@ - name: collect any backup files find: paths: "{{ role_path }}/backup" - pattern: "{{ inventory_hostname }}_config*" + pattern: "{{ inventory_hostname_short }}_config*" register: backup_files delegate_to: localhost diff --git a/test/integration/targets/asa_config/tests/cli/toplevel.yaml b/test/integration/targets/asa_config/tests/cli/toplevel.yaml index 870dd42b2e..c590bc781b 100644 --- a/test/integration/targets/asa_config/tests/cli/toplevel.yaml +++ b/test/integration/targets/asa_config/tests/cli/toplevel.yaml @@ -29,7 +29,7 @@ - name: teardown asa_config: - lines: ['hostname {{ inventory_hostname }}'] + lines: ['hostname {{ inventory_hostname_short }}'] provider: "{{ cli }}" - debug: msg="END cli/toplevel.yaml" diff --git a/test/integration/targets/asa_config/tests/cli/toplevel_after.yaml b/test/integration/targets/asa_config/tests/cli/toplevel_after.yaml index 3fbe745237..3bf0a35170 100644 --- a/test/integration/targets/asa_config/tests/cli/toplevel_after.yaml +++ b/test/integration/targets/asa_config/tests/cli/toplevel_after.yaml @@ -36,7 +36,7 @@ asa_config: lines: - "no snmp-server contact" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" - debug: msg="END cli/toplevel_after.yaml" diff --git a/test/integration/targets/asa_config/tests/cli/toplevel_before.yaml b/test/integration/targets/asa_config/tests/cli/toplevel_before.yaml index c326bc5f2d..4624e0df98 100644 --- a/test/integration/targets/asa_config/tests/cli/toplevel_before.yaml +++ b/test/integration/targets/asa_config/tests/cli/toplevel_before.yaml @@ -36,7 +36,7 @@ asa_config: lines: - "no snmp-server contact" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" - debug: msg="END cli/toplevel_before.yaml" diff --git a/test/integration/targets/asa_config/tests/cli/toplevel_nonidempotent.yaml b/test/integration/targets/asa_config/tests/cli/toplevel_nonidempotent.yaml index 9e8eafdcf0..314ef44164 100644 --- a/test/integration/targets/asa_config/tests/cli/toplevel_nonidempotent.yaml +++ b/test/integration/targets/asa_config/tests/cli/toplevel_nonidempotent.yaml @@ -32,7 +32,7 @@ - name: teardown asa_config: - lines: ['hostname {{ inventory_hostname }}'] + lines: ['hostname {{ inventory_hostname_short }}'] provider: "{{ cli }}" - debug: msg="END cli/toplevel_nonidempotent.yaml" |