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/nxos_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/nxos_config')
10 files changed, 20 insertions, 20 deletions
diff --git a/test/integration/targets/nxos_config/tests/cli/backup.yaml b/test/integration/targets/nxos_config/tests/cli/backup.yaml index e3f9e14d17..7670923fb4 100644 --- a/test/integration/targets/nxos_config/tests/cli/backup.yaml +++ b/test/integration/targets/nxos_config/tests/cli/backup.yaml @@ -14,7 +14,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 @@ -39,7 +39,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/nxos_config/tests/cli/toplevel.yaml b/test/integration/targets/nxos_config/tests/cli/toplevel.yaml index f66e41e68d..f495c51d52 100644 --- a/test/integration/targets/nxos_config/tests/cli/toplevel.yaml +++ b/test/integration/targets/nxos_config/tests/cli/toplevel.yaml @@ -3,7 +3,7 @@ - name: setup nxos_config: - lines: hostname {{ inventory_hostname }} + lines: hostname {{ inventory_hostname_short }} provider: "{{ cli }}" match: none @@ -30,7 +30,7 @@ - name: teardown nxos_config: - lines: hostname {{ inventory_hostname }} + lines: hostname {{ inventory_hostname_short }} provider: "{{ cli }}" match: none diff --git a/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml b/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml index d8e5dc549a..393b686fc0 100644 --- a/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml +++ b/test/integration/targets/nxos_config/tests/cli/toplevel_after.yaml @@ -5,7 +5,7 @@ nxos_config: lines: - "snmp-server contact ansible" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" match: none @@ -37,7 +37,7 @@ nxos_config: lines: - "no snmp-server contact" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" match: none diff --git a/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml b/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml index ef64b7ce9d..acec416683 100644 --- a/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml +++ b/test/integration/targets/nxos_config/tests/cli/toplevel_before.yaml @@ -5,7 +5,7 @@ nxos_config: lines: - "snmp-server contact ansible" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" match: none @@ -37,7 +37,7 @@ nxos_config: lines: - "no snmp-server contact" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" match: none diff --git a/test/integration/targets/nxos_config/tests/cli/toplevel_nonidempotent.yaml b/test/integration/targets/nxos_config/tests/cli/toplevel_nonidempotent.yaml index 049eac7b6c..1fd3bd9d77 100644 --- a/test/integration/targets/nxos_config/tests/cli/toplevel_nonidempotent.yaml +++ b/test/integration/targets/nxos_config/tests/cli/toplevel_nonidempotent.yaml @@ -3,7 +3,7 @@ - name: setup nxos_config: - lines: hostname {{ inventory_hostname }} + lines: hostname {{ inventory_hostname_short }} provider: "{{ cli }}" match: none @@ -32,7 +32,7 @@ - name: teardown nxos_config: - lines: hostname {{ inventory_hostname }} + lines: hostname {{ inventory_hostname_short }} provider: "{{ cli }}" match: none diff --git a/test/integration/targets/nxos_config/tests/nxapi/backup.yaml b/test/integration/targets/nxos_config/tests/nxapi/backup.yaml index 9b063d0238..a33ab38413 100644 --- a/test/integration/targets/nxos_config/tests/nxapi/backup.yaml +++ b/test/integration/targets/nxos_config/tests/nxapi/backup.yaml @@ -14,7 +14,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 @@ -39,7 +39,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/nxos_config/tests/nxapi/toplevel.yaml b/test/integration/targets/nxos_config/tests/nxapi/toplevel.yaml index 7485f61c3b..c88026c410 100644 --- a/test/integration/targets/nxos_config/tests/nxapi/toplevel.yaml +++ b/test/integration/targets/nxos_config/tests/nxapi/toplevel.yaml @@ -3,7 +3,7 @@ - name: setup nxos_config: - lines: hostname {{ inventory_hostname }} + lines: hostname {{ inventory_hostname_short }} provider: "{{ nxapi }}" match: none @@ -30,7 +30,7 @@ - name: teardown nxos_config: - lines: hostname {{ inventory_hostname }} + lines: hostname {{ inventory_hostname_short }} provider: "{{ nxapi }}" match: none diff --git a/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml b/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml index 05b251edc1..6eeeeafd2c 100644 --- a/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml +++ b/test/integration/targets/nxos_config/tests/nxapi/toplevel_after.yaml @@ -5,7 +5,7 @@ nxos_config: lines: - "snmp-server contact ansible" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ nxapi }}" match: none @@ -37,7 +37,7 @@ nxos_config: lines: - "no snmp-server contact ansible" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ nxapi }}" match: none diff --git a/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml b/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml index 7f2ff373bf..17e3390d70 100644 --- a/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml +++ b/test/integration/targets/nxos_config/tests/nxapi/toplevel_before.yaml @@ -5,7 +5,7 @@ nxos_config: lines: - "snmp-server contact ansible" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ nxapi }}" match: none @@ -37,7 +37,7 @@ nxos_config: lines: - "no snmp-server contact ansible" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ nxapi }}" match: none diff --git a/test/integration/targets/nxos_config/tests/nxapi/toplevel_nonidempotent.yaml b/test/integration/targets/nxos_config/tests/nxapi/toplevel_nonidempotent.yaml index 52089616df..7a99ac3f2a 100644 --- a/test/integration/targets/nxos_config/tests/nxapi/toplevel_nonidempotent.yaml +++ b/test/integration/targets/nxos_config/tests/nxapi/toplevel_nonidempotent.yaml @@ -3,7 +3,7 @@ - name: setup nxos_config: - lines: hostname {{ inventory_hostname }} + lines: hostname {{ inventory_hostname_short }} provider: "{{ nxapi }}" match: none @@ -32,7 +32,7 @@ - name: setup nxos_config: - lines: hostname {{ inventory_hostname }} + lines: hostname {{ inventory_hostname_short }} provider: "{{ nxapi }}" match: none |