From 0a2df4cdaf67470410d0791dcd33b179c7cce507 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 30 Aug 2017 17:49:10 +0200 Subject: [PATCH] Remove network integration group_vars/host_vars (#28827) * Remove network integration group_vars/host_vars We use our own inventory in DCI, which is passed to ansible-test with --inventory. However, as the working directory of ansible-test is set to test/integration, ansible consumes the repo group_vars/host_vars. That imposes a problem, since they have greater precedence to inventory variables. Let's just remove group_vars/host_vars so end-users can assume those vars can be used, the inventory and group/host vars are environment dependent, each user should create their own. * Restore files I git rm'd by mistake --- test/integration/group_vars/asa.yaml | 8 -------- test/integration/group_vars/dellos10.yaml | 6 ------ test/integration/group_vars/dellos6.yaml | 8 -------- test/integration/group_vars/dellos9.yaml | 8 -------- test/integration/group_vars/eos.yaml | 13 ------------- test/integration/group_vars/ios.yaml | 6 ------ test/integration/group_vars/iosxr.yaml | 6 ------ test/integration/group_vars/junos.yaml | 12 ------------ test/integration/group_vars/nxos.yaml | 14 -------------- test/integration/group_vars/ops.yaml | 6 ------ test/integration/group_vars/vyos.yaml | 6 ------ 11 files changed, 93 deletions(-) delete mode 100644 test/integration/group_vars/asa.yaml delete mode 100644 test/integration/group_vars/dellos10.yaml delete mode 100644 test/integration/group_vars/dellos6.yaml delete mode 100644 test/integration/group_vars/dellos9.yaml delete mode 100644 test/integration/group_vars/eos.yaml delete mode 100644 test/integration/group_vars/ios.yaml delete mode 100644 test/integration/group_vars/iosxr.yaml delete mode 100644 test/integration/group_vars/junos.yaml delete mode 100644 test/integration/group_vars/nxos.yaml delete mode 100644 test/integration/group_vars/ops.yaml delete mode 100644 test/integration/group_vars/vyos.yaml diff --git a/test/integration/group_vars/asa.yaml b/test/integration/group_vars/asa.yaml deleted file mode 100644 index b6316e57ac..0000000000 --- a/test/integration/group_vars/asa.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -cli: - host: "{{ inventory_hostname }}" - username: "{{ asa_cli_user | default('cisco') }}" - password: "{{ asa_cli_pass | default('cisco') }}" - transport: cli - authorize: yes - auth_pass: "{{ asa_auth_pass | default('cisco') }}" diff --git a/test/integration/group_vars/dellos10.yaml b/test/integration/group_vars/dellos10.yaml deleted file mode 100644 index 48a3d59a07..0000000000 --- a/test/integration/group_vars/dellos10.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -cli: - host: "{{ ansible_host }}" - username: "{{ dellos10_cli_user | default('admin') }}" - password: "{{ dellos10_cli_pass | default('admin') }}" - transport: cli diff --git a/test/integration/group_vars/dellos6.yaml b/test/integration/group_vars/dellos6.yaml deleted file mode 100644 index 668f287c07..0000000000 --- a/test/integration/group_vars/dellos6.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -cli: - host: "{{ ansible_host }}" - username: "{{ dellos_cli_user | default('admin') }}" - password: "{{ dellos_cli_pass | default('admin') }}" - authorize: true - auth_pass: "{{ dellos_cli_auth_pass | default('calvin') }}" - transport: cli diff --git a/test/integration/group_vars/dellos9.yaml b/test/integration/group_vars/dellos9.yaml deleted file mode 100644 index 3b3bb6bd39..0000000000 --- a/test/integration/group_vars/dellos9.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -cli: - host: "{{ ansible_host }}" - username: "{{ dellos9_cli_user | default('admin') }}" - password: "{{ dellos9_cli_pass | default('admin') }}" - authorize: true - auth_pass: "{{ dellos9_cli_en_pass | default('calvin') }}" - transport: cli diff --git a/test/integration/group_vars/eos.yaml b/test/integration/group_vars/eos.yaml deleted file mode 100644 index a301707165..0000000000 --- a/test/integration/group_vars/eos.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -cli: - host: "{{ ansible_host }}" - transport: cli - authorize: yes - -eapi: - host: "{{ ansible_host }}" - transport: eapi - timeout: 60 - use_ssl: no - port: 80 - authorize: yes diff --git a/test/integration/group_vars/ios.yaml b/test/integration/group_vars/ios.yaml deleted file mode 100644 index 21b55f5621..0000000000 --- a/test/integration/group_vars/ios.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -cli: - host: "{{ inventory_hostname }}" - username: "{{ ios_cli_user | default('cisco') }}" - password: "{{ ios_cli_pass | default('cisco') }}" - transport: cli diff --git a/test/integration/group_vars/iosxr.yaml b/test/integration/group_vars/iosxr.yaml deleted file mode 100644 index 878b47b366..0000000000 --- a/test/integration/group_vars/iosxr.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -cli: - host: "{{ inventory_hostname }}" - username: "{{ iosxr_cli_user | default('root') }}" - password: "{{ iosxr_cli_pass | default('root') }}" - transport: cli diff --git a/test/integration/group_vars/junos.yaml b/test/integration/group_vars/junos.yaml deleted file mode 100644 index 4672197b7d..0000000000 --- a/test/integration/group_vars/junos.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -netconf: - host: "{{ ansible_ssh_host }}" - #username: "{{ junos_cli_user | default('ansible') }}" - #password: "{{ junos_cli_pass | default('Ansible') }}" - transport: netconf - -cli: - host: "{{ ansible_ssh_host }}" - #username: "{{ junos_cli_user | default('ansible') }}" - #password: "{{ junos_cli_pass | default('Ansible') }}" - transport: cli diff --git a/test/integration/group_vars/nxos.yaml b/test/integration/group_vars/nxos.yaml deleted file mode 100644 index fb61562054..0000000000 --- a/test/integration/group_vars/nxos.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -cli: - host: "{{ ansible_ssh_host }}" - #username: "{{ nxos_cli_user | default('admin') }}" - #password: "{{ nxos_cli_pass | default('admin') }}" - transport: cli - -nxapi: - host: "{{ ansible_ssh_host }}" - #username: "{{ nxos_nxapi_user | default('admin') }}" - #password: "{{ nxos_nxapi_pass | default('admin') }}" - transport: nxapi - use_ssl: no - port: 8080 diff --git a/test/integration/group_vars/ops.yaml b/test/integration/group_vars/ops.yaml deleted file mode 100644 index d9580e8197..0000000000 --- a/test/integration/group_vars/ops.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -cli: - host: "{{ inventory_hostname }}" - username: "{{ ops_cli_user | default('netop') }}" - password: "{{ ops_cli_pass | default('netop') }}" - transport: cli diff --git a/test/integration/group_vars/vyos.yaml b/test/integration/group_vars/vyos.yaml deleted file mode 100644 index 6a02c73cda..0000000000 --- a/test/integration/group_vars/vyos.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -cli: - host: "{{ ansible_ssh_host }}" -# username: "{{ vyos_cli_user | default('ansible-admin') }}" -# password: "{{ vyos_cli_pass | default('adminpw') }}" - transport: cli