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/dellos10_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/dellos10_config')
4 files changed, 8 insertions, 8 deletions
diff --git a/test/integration/targets/dellos10_config/tests/cli/toplevel.yaml b/test/integration/targets/dellos10_config/tests/cli/toplevel.yaml index df5435f3f8..5cc299d173 100644 --- a/test/integration/targets/dellos10_config/tests/cli/toplevel.yaml +++ b/test/integration/targets/dellos10_config/tests/cli/toplevel.yaml @@ -3,7 +3,7 @@ - name: setup dellos10_config: - lines: ['hostname {{ inventory_hostname }}'] + lines: ['hostname {{ inventory_hostname_short }}'] provider: "{{ cli }}" match: none @@ -30,7 +30,7 @@ - name: teardown dellos10_config: - lines: ['hostname {{ inventory_hostname }}'] + lines: ['hostname {{ inventory_hostname_short }}'] provider: "{{ cli }}" match: none diff --git a/test/integration/targets/dellos10_config/tests/cli/toplevel_after.yaml b/test/integration/targets/dellos10_config/tests/cli/toplevel_after.yaml index 57948bcfc6..3e6dbf1863 100644 --- a/test/integration/targets/dellos10_config/tests/cli/toplevel_after.yaml +++ b/test/integration/targets/dellos10_config/tests/cli/toplevel_after.yaml @@ -5,7 +5,7 @@ dellos10_config: lines: - "snmp-server contact ansible" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" match: none @@ -37,7 +37,7 @@ dellos10_config: lines: - "no snmp-server contact" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" match: none diff --git a/test/integration/targets/dellos10_config/tests/cli/toplevel_before.yaml b/test/integration/targets/dellos10_config/tests/cli/toplevel_before.yaml index 4e0acf604f..14768e88d4 100644 --- a/test/integration/targets/dellos10_config/tests/cli/toplevel_before.yaml +++ b/test/integration/targets/dellos10_config/tests/cli/toplevel_before.yaml @@ -5,7 +5,7 @@ dellos10_config: lines: - "snmp-server contact ansible" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" match: none @@ -37,7 +37,7 @@ dellos10_config: lines: - "no snmp-server contact" - - "hostname {{ inventory_hostname }}" + - "hostname {{ inventory_hostname_short }}" provider: "{{ cli }}" match: none diff --git a/test/integration/targets/dellos10_config/tests/cli/toplevel_nonidempotent.yaml b/test/integration/targets/dellos10_config/tests/cli/toplevel_nonidempotent.yaml index ad285718ba..120cf149bc 100644 --- a/test/integration/targets/dellos10_config/tests/cli/toplevel_nonidempotent.yaml +++ b/test/integration/targets/dellos10_config/tests/cli/toplevel_nonidempotent.yaml @@ -3,7 +3,7 @@ - name: setup dellos10_config: - lines: ['hostname {{ inventory_hostname }}'] + lines: ['hostname {{ inventory_hostname_short }}'] provider: "{{ cli }}" match: none @@ -32,7 +32,7 @@ - name: teardown dellos10_config: - lines: ['hostname {{ inventory_hostname }}'] + lines: ['hostname {{ inventory_hostname_short }}'] provider: "{{ cli }}" match: none |