openstack/kayobe
Code Issues Proposed changes

Make ansible_host optional for all switch types

Browse Source 
The Juniper device support allows ansible_host variable to not be set
for a switch, in which case the inventory_hostname will be used instead.

This change applies this default consistently across all switch types.

Change-Id: Ibc1e673a6b988f2e8d7bb6c62d30ccdb7ce96351
Story: 2004358
Task: 27958
This commit is contained in:
Mark Goddard 2018-11-16 15:07:15 +00:00
parent 3df008fdc4
commit ae340128e6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all/switches/dell
View File

@ -7,7 +7,7 @@
# For DellOS switches, this defines a 'provider' argument to the dellos_* # For DellOS switches, this defines a 'provider' argument to the dellos_*
# modules. # modules.
switch_dellos_provider: switch_dellos_provider:
host: "{{ ansible_host }}" host: "{{ ansible_host|default(inventory_hostname) }}"
username: "{{ ansible_user }}" username: "{{ ansible_user }}"
password: "{{ ansible_ssh_pass }}" password: "{{ ansible_ssh_pass }}"
transport: cli transport: cli

2
ansible/group_vars/all/switches/dell-powerconnect
View File

@ -7,6 +7,6 @@
# For DellOS switches, this defines a 'provider' argument to the # For DellOS switches, this defines a 'provider' argument to the
# dell_powerconnect_switch role. # dell_powerconnect_switch role.
switch_dell_powerconnect_provider: switch_dell_powerconnect_provider:
host: "{{ ansible_host }}" host: "{{ ansible_host|default(inventory_hostname) }}"
username: "{{ ansible_user }}" username: "{{ ansible_user }}"
auth_pass: "{{ switch_auth_pass }}" auth_pass: "{{ switch_auth_pass }}"

2
ansible/group_vars/all/switches/mellanox
View File

@ -7,6 +7,6 @@
# For Mellanox switches, this defines a 'provider' argument to the # For Mellanox switches, this defines a 'provider' argument to the
# mellanox-switch role. # mellanox-switch role.
switch_mellanox_provider: switch_mellanox_provider:
host: "{{ ansible_host }}" host: "{{ ansible_host|default(inventory_hostname) }}"
username: "{{ ansible_user }}" username: "{{ ansible_user }}"
auth_pass: "{{ switch_auth_pass }}" auth_pass: "{{ switch_auth_pass }}"

6
doc/source/configuration/physical-network.rst
View File

@ -182,7 +182,7 @@ Configuration for these devices is applied using the ``dellos6_config`` and
Provider Provider
^^^^^^^^ ^^^^^^^^
* ``ansible_host`` is the hostname or IP address. * ``ansible_host`` is the hostname or IP address. Optional.
* ``ansible_user`` is the SSH username. * ``ansible_user`` is the SSH username.
@ -205,7 +205,7 @@ Configuration for these devices is applied using the
Provider Provider
^^^^^^^^ ^^^^^^^^
* ``ansible_host`` is the hostname or IP address. * ``ansible_host`` is the hostname or IP address. Optional.
* ``ansible_user`` is the SSH username. * ``ansible_user`` is the SSH username.
@ -254,7 +254,7 @@ Ansible module to automate interaction with the switch CLI via SSH.
Provider Provider
^^^^^^^^ ^^^^^^^^
* ``ansible_host`` is the hostname or IP address. * ``ansible_host`` is the hostname or IP address. Optional.
* ``ansible_user`` is the SSH username. * ``ansible_user`` is the SSH username.