From f0b409e48408e811ded1f2cc9909271ec26e3feb Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 29 Aug 2017 13:01:45 +0000 Subject: [PATCH] Add _network_interfaces for controllers, monitoring, seed, seed-hypervisor This allows for the full set of interfaces to be overridden by setting one of these variables, rather than simply extending the default list via _extra_network_interfaces. --- ansible/group_vars/all/controllers | 5 +++++ ansible/group_vars/all/monitoring | 7 +++++++ ansible/group_vars/all/seed | 5 +++++ ansible/group_vars/all/seed-hypervisor | 5 +++++ ansible/group_vars/controllers/network | 4 +--- ansible/group_vars/monitoring/network | 7 +------ ansible/group_vars/seed-hypervisor/network | 4 +--- ansible/group_vars/seed/network | 4 +--- etc/kayobe/controllers.yml | 3 +++ etc/kayobe/monitoring.yml | 3 +++ etc/kayobe/seed-hypervisor.yml | 3 +++ etc/kayobe/seed.yml | 3 +++ 12 files changed, 38 insertions(+), 15 deletions(-) diff --git a/ansible/group_vars/all/controllers b/ansible/group_vars/all/controllers index d9400e67a..9091ab08d 100644 --- a/ansible/group_vars/all/controllers +++ b/ansible/group_vars/all/controllers @@ -9,6 +9,11 @@ controller_bootstrap_user: "{{ lookup('env', 'USER') }}" ############################################################################### # Controller network interface configuration. +# List of networks to which controller nodes are attached. +controller_network_interfaces: > + {{ (controller_default_network_interfaces + + controller_extra_network_interfaces) | unique | list }} + # List of default networks to which controller nodes are attached. controller_default_network_interfaces: > {{ [provision_oc_net_name, diff --git a/ansible/group_vars/all/monitoring b/ansible/group_vars/all/monitoring index 5a830c0ec..f66c322a6 100644 --- a/ansible/group_vars/all/monitoring +++ b/ansible/group_vars/all/monitoring @@ -9,6 +9,13 @@ monitoring_bootstrap_user: "{{ controller_bootstrap_user }}" ############################################################################### # Monitoring node network interface configuration. +# List of networks to which monitoring nodes are attached. +monitoring_network_interfaces: > + {{ controller_network_interfaces | unique | list + if inventory_hostname in groups['controllers'] else + (monitoring_default_network_interfaces + + monitoring_extra_network_interfaces) | unique | list }} + # List of default networks to which monitoring nodes are attached. monitoring_default_network_interfaces: > {{ [provision_oc_net_name, diff --git a/ansible/group_vars/all/seed b/ansible/group_vars/all/seed index 13d600d37..a738cfa65 100644 --- a/ansible/group_vars/all/seed +++ b/ansible/group_vars/all/seed @@ -9,6 +9,11 @@ seed_bootstrap_user: "{{ lookup('env', 'USER') }}" ############################################################################### # Seed network interface configuration. +# List of networks to which seed nodes are attached. +seed_network_interfaces: > + {{ (seed_default_network_interfaces + + seed_extra_network_interfaces) | unique | list }} + # List of default networks to which seed nodes are attached. seed_default_network_interfaces: > {{ [oob_oc_net_name, diff --git a/ansible/group_vars/all/seed-hypervisor b/ansible/group_vars/all/seed-hypervisor index 764d8867c..f46840d08 100644 --- a/ansible/group_vars/all/seed-hypervisor +++ b/ansible/group_vars/all/seed-hypervisor @@ -2,6 +2,11 @@ ############################################################################### # Seed hypervisor network interface configuration. +# List of networks to which seed hypervisor nodes are attached. +seed_hypervisor_network_interfaces: > + {{ (seed_hypervisor_default_network_interfaces + + seed_hypervisor_extra_network_interfaces) | unique | list }} + # List of default networks to which seed hypervisor nodes are attached. seed_hypervisor_default_network_interfaces: "{{ seed_default_network_interfaces }}" diff --git a/ansible/group_vars/controllers/network b/ansible/group_vars/controllers/network index 3fd920c4f..e48a11636 100644 --- a/ansible/group_vars/controllers/network +++ b/ansible/group_vars/controllers/network @@ -3,6 +3,4 @@ # Network interface attachments. # List of networks to which these nodes are attached. -network_interfaces: > - {{ (controller_default_network_interfaces + - controller_extra_network_interfaces) | unique | list }} +network_interfaces: "{{ controller_network_interfaces | unique | list }}" diff --git a/ansible/group_vars/monitoring/network b/ansible/group_vars/monitoring/network index 6fcde222a..7652ab282 100644 --- a/ansible/group_vars/monitoring/network +++ b/ansible/group_vars/monitoring/network @@ -3,9 +3,4 @@ # Network interface attachments. # List of networks to which these nodes are attached. -network_interfaces: > - {{ (controller_default_network_interfaces + - controller_extra_network_interfaces) | unique | list - if inventory_hostname in groups['controllers'] else - (monitoring_default_network_interfaces + - monitoring_extra_network_interfaces) | unique | list }} +network_interfaces: "{{ monitoring_network_interfaces | unique | list }}" diff --git a/ansible/group_vars/seed-hypervisor/network b/ansible/group_vars/seed-hypervisor/network index 8ab38a57c..17a17b6ba 100644 --- a/ansible/group_vars/seed-hypervisor/network +++ b/ansible/group_vars/seed-hypervisor/network @@ -3,6 +3,4 @@ # Network interface attachments. # List of networks to which these nodes are attached. -network_interfaces: > - {{ (seed_hypervisor_default_network_interfaces + - seed_hypervisor_extra_network_interfaces) | unique | list }} +network_interfaces: "{{ seed_hypervisor_network_interfaces | unique | list }}" diff --git a/ansible/group_vars/seed/network b/ansible/group_vars/seed/network index 37d928760..119ed0ea3 100644 --- a/ansible/group_vars/seed/network +++ b/ansible/group_vars/seed/network @@ -3,6 +3,4 @@ # Network interface attachments. # List of networks to which these nodes are attached. -network_interfaces: > - {{ (seed_default_network_interfaces + - seed_extra_network_interfaces) | unique | list }} +network_interfaces: "{{ seed_network_interfaces | unique | list }}" diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml index e7cc2f646..c6771d085 100644 --- a/etc/kayobe/controllers.yml +++ b/etc/kayobe/controllers.yml @@ -9,6 +9,9 @@ ############################################################################### # Network interface attachments. +# List of networks to which controller nodes are attached. +#controller_network_interfaces: + # List of default networks to which controller nodes are attached. #controller_default_network_interfaces: diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml index 0862b649d..300c4a714 100644 --- a/etc/kayobe/monitoring.yml +++ b/etc/kayobe/monitoring.yml @@ -9,6 +9,9 @@ ############################################################################### # Monitoring node network interface configuration. +# List of networks to which monitoring nodes are attached. +#monitoring_network_interfaces: + # List of default networks to which monitoring nodes are attached. #monitoring_default_network_interfaces: diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml index 49d06a6ef..33c1c530c 100644 --- a/etc/kayobe/seed-hypervisor.yml +++ b/etc/kayobe/seed-hypervisor.yml @@ -2,6 +2,9 @@ ############################################################################### # Seed hypervisor network interface configuration. +# List of networks to which seed hypervisor nodes are attached. +#seed_hypervisor_network_interfaces: + # List of default networks to which seed hypervisor nodes are attached. #seed_hypervisor_default_network_interfaces: diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index bd179ce7a..eda888a6d 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -9,6 +9,9 @@ ############################################################################### # Network interface attachments. +# List of networks to which seed nodes are attached. +#seed_network_interfaces: + # List of default networks to which seed nodes are attached. #seed_default_network_interfaces: