openstack/kayobe
Code Issues Proposed changes

Merge "Fix handling of switch_type variable in Ansible 2.5"

Browse Source
This commit is contained in:
Zuul 2018-08-02 17:03:09 +00:00 committed by Gerrit Code Review
commit fa9f0b9d30
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/group_vars/switches/type
View File

@ -1,7 +0,0 @@
---
###############################################################################
# Switch type configuration.
# This configures the type of switch, which is used to determine how the switch
# will be configured.
switch_type:

14
ansible/physical-network.yml
View File

@ -19,6 +19,12 @@
# Set this variable to True in order to display the candidate switch
# configuration and exit without applying it.
physical_network_display: False
# List of supported values for the 'switch_type' variable.
supported_switch_types:
- dell
- dell-powerconnect
- junos
- mellanox
tasks:
- name: Fail if both interface name and description limits are specified
fail:
@ -29,6 +35,14 @@
- physical_network_interface_limit != ''
- physical_network_interface_description_limit != ''
- name: Fail if the switch type is not defined
fail:
msg: >
The switch type is not defined or is unrecognised. Configure the type
of each host in the 'switches' group via the 'switch_type' variable.
when: switch_type is not defined or
switch_type not in supported_switch_types
- name: Group hosts by their switch type
group_by:
key: "switches_of_type_{{ switch_type }}"