From e04ec57f9d0a710aeda8cd88aff2f2cee4d2e31b Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Wed, 13 Feb 2019 18:35:15 +0100 Subject: [PATCH] F #2645: Generalisation of vxlan playbook (#2931) --- .../{vxlan_packet => static_vxlan}/group_vars/all | 7 ++++--- .../ansible/{vxlan_packet.yml => static_vxlan.yml} | 0 .../templates/{vxlan_packet.yaml => static_vxlan.yaml} | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename share/oneprovision/ansible/inventories/{vxlan_packet => static_vxlan}/group_vars/all (63%) rename share/oneprovision/ansible/{vxlan_packet.yml => static_vxlan.yml} (100%) rename share/oneprovision/templates/{vxlan_packet.yaml => static_vxlan.yaml} (95%) diff --git a/share/oneprovision/ansible/inventories/vxlan_packet/group_vars/all b/share/oneprovision/ansible/inventories/static_vxlan/group_vars/all similarity index 63% rename from share/oneprovision/ansible/inventories/vxlan_packet/group_vars/all rename to share/oneprovision/ansible/inventories/static_vxlan/group_vars/all index 4760e03cf1..b09b5623cc 100644 --- a/share/oneprovision/ansible/inventories/vxlan_packet/group_vars/all +++ b/share/oneprovision/ansible/inventories/static_vxlan/group_vars/all @@ -20,8 +20,9 @@ iptables_base_rules_strict: false # Parameters for static VXLAN connections between provisioned hosts opennebula_p2p_vxlan_bridge: vxbr100 -opennebula_p2p_vxlan_phydev: bond0:0 +opennebula_p2p_vxlan_phydev: "{{ ansible_interfaces | sort | select('in', ['bond0_0', 'eth0']) | first | replace('_', ':') }}" +ansible_phydev: "ansible_{{ ansible_interfaces | sort | select('in', ['bond0_0', 'eth0']) | first }}" opennebula_p2p_vxlan_vxlan_vni: 100 opennebula_p2p_vxlan_vxlan_dev: vxlan100 -opennebula_p2p_vxlan_vxlan_local_ip: '{{ ansible_facts["bond0_0"]["ipv4"]["address"] }}' -opennebula_p2p_vxlan_remotes: "{{ groups['nodes'] | map('extract', hostvars, ['ansible_bond0_0', 'ipv4', 'address']) | list }}" +opennebula_p2p_vxlan_vxlan_local_ip: '{{ ansible_facts[opennebula_p2p_vxlan_phydev | replace(":", "_")]["ipv4"]["address"] }}' +opennebula_p2p_vxlan_remotes: "{{ groups['nodes'] | map('extract', hostvars, [ansible_phydev, 'ipv4', 'address']) | list }}" diff --git a/share/oneprovision/ansible/vxlan_packet.yml b/share/oneprovision/ansible/static_vxlan.yml similarity index 100% rename from share/oneprovision/ansible/vxlan_packet.yml rename to share/oneprovision/ansible/static_vxlan.yml diff --git a/share/oneprovision/templates/vxlan_packet.yaml b/share/oneprovision/templates/static_vxlan.yaml similarity index 95% rename from share/oneprovision/templates/vxlan_packet.yaml rename to share/oneprovision/templates/static_vxlan.yaml index 10c898dcbb..a11b11e75c 100644 --- a/share/oneprovision/templates/vxlan_packet.yaml +++ b/share/oneprovision/templates/static_vxlan.yaml @@ -1,6 +1,6 @@ --- version: 2 -playbook: vxlan_packet +playbook: static_vxlan networks: - name: "nat"