airship/airshipctl
Code Issues Proposed changes

Merge "Support Dualstack IPv6 in AIAP"

Browse Source
This commit is contained in:
Zuul 2021-12-21 01:27:15 +00:00 committed by Gerrit Code Review
commit 5e83b8997b
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/airship-in-a-pod/infra-builder/assets/opt/ansible/playbooks/roles/build-infra/defaults/main.yaml
View File

@ -52,11 +52,17 @@ networks:
ip: ip:
address: "10.23.24.1" address: "10.23.24.1"
netmask: "255.255.255.0" netmask: "255.255.255.0"
ipv6:
address: "2001:468:181:f200::1"
prefix: "64"
- name: nat - name: nat
bridge: "air_nat" bridge: "air_nat"
ip: ip:
address: "10.23.25.1" address: "10.23.25.1"
netmask: "255.255.255.0" netmask: "255.255.255.0"
ipv6:
address: "2001:468:181:f100::1"
prefix: "64"
- name: default - name: default
bridge: "default" bridge: "default"
ip: ip:

2
tools/airship-in-a-pod/infra-builder/assets/opt/ansible/playbooks/roles/build-infra/templates/air_nat.xml.j2
View File

@ -7,4 +7,6 @@
</forward><bridge name="nat_br" stp="on" delay="0"/> </forward><bridge name="nat_br" stp="on" delay="0"/>
<ip address="{{ networks[1].ip.address }}" netmask="{{ networks[1].ip.netmask }}"> <ip address="{{ networks[1].ip.address }}" netmask="{{ networks[1].ip.netmask }}">
</ip> </ip>
<ip family="ipv6" address="{{ networks[1].ipv6.address }}" prefix="{{ networks[1].ipv6.prefix }}">
</ip>
</network> </network>

2
tools/airship-in-a-pod/infra-builder/assets/opt/ansible/playbooks/roles/build-infra/templates/air_prov.xml.j2
View File

@ -4,4 +4,6 @@
<bridge name="prov_br" stp="on" delay="0"/> <bridge name="prov_br" stp="on" delay="0"/>
<ip address="{{ networks[0].ip.address }}" netmask="{{ networks[0].ip.netmask }}"> <ip address="{{ networks[0].ip.address }}" netmask="{{ networks[0].ip.netmask }}">
</ip> </ip>
<ip family="ipv6" address="{{ networks[0].ipv6.address }}" prefix="{{ networks[0].ipv6.prefix }}">
</ip>
</network> </network>