C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use blocks for macvlan tasks for each distribution (#8918)

Browse source 
For the code readability, this adds blocks for each distribution.
This commit is contained in:
Kenichi Omichi 2022-06-06 07:50:24 -07:00 committed by GitHub
parent 14c0f368b6
commit 814760ba25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
roles/network_plugin/macvlan/tasks/main.yml
View file

@ -27,7 +27,8 @@
notify: Macvlan | restart network notify: Macvlan | restart network
when: ansible_os_family in ["Debian"] when: ansible_os_family in ["Debian"]
- name: Macvlan | Install macvlan script on centos - block:
- name: Macvlan | Install macvlan script on centos
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: /etc/sysconfig/network-scripts/ dest: /etc/sysconfig/network-scripts/
@ -36,18 +37,17 @@
mode: "0755" mode: "0755"
with_fileglob: with_fileglob:
- files/* - files/*
when: ansible_os_family == "RedHat"
- name: Macvlan | Install post-up script on centos - name: Macvlan | Install post-up script on centos
copy: copy:
src: "files/ifup-local" src: "files/ifup-local"
dest: /sbin/ dest: /sbin/
owner: root owner: root
group: root group: root
mode: "0755" mode: "0755"
when: ansible_os_family == "RedHat" and enable_nat_default_gateway when: enable_nat_default_gateway
- name: Macvlan | Install network gateway interface on centos - name: Macvlan | Install network gateway interface on centos
template: template:
src: "{{ item.src }}.j2" src: "{{ item.src }}.j2"
dest: "/etc/sysconfig/network-scripts/{{ item.dst }}" dest: "/etc/sysconfig/network-scripts/{{ item.dst }}"
@ -57,23 +57,25 @@
- {src: centos-routes-macvlan.cfg, dst: route-mac0 } - {src: centos-routes-macvlan.cfg, dst: route-mac0 }
- {src: centos-postup-macvlan.cfg, dst: post-up-mac0 } - {src: centos-postup-macvlan.cfg, dst: post-up-mac0 }
notify: Macvlan | restart network notify: Macvlan | restart network
when: ansible_os_family == "RedHat" when: ansible_os_family == "RedHat"
- name: Macvlan | Install service nat via gateway on Flatcar Container Linux - block:
- name: Macvlan | Install service nat via gateway on Flatcar Container Linux
template: template:
src: coreos-service-nat_ouside.j2 src: coreos-service-nat_ouside.j2
dest: /etc/systemd/system/enable_nat_ouside.service dest: /etc/systemd/system/enable_nat_ouside.service
mode: 0644 mode: 0644
when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"] and enable_nat_default_gateway when: enable_nat_default_gateway
- name: Macvlan | Enable service nat via gateway on Flatcar Container Linux - name: Macvlan | Enable service nat via gateway on Flatcar Container Linux
command: "{{ item }}" command: "{{ item }}"
with_items: with_items:
- systemctl daemon-reload - systemctl daemon-reload
- systemctl enable enable_nat_ouside.service - systemctl enable enable_nat_ouside.service
when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"] and enable_nat_default_gateway when: enable_nat_default_gateway
- name: Macvlan | Install network gateway interface on Flatcar Container Linux - name: Macvlan | Install network gateway interface on Flatcar Container Linux
template: template:
src: "{{ item.src }}.j2" src: "{{ item.src }}.j2"
dest: "/etc/systemd/network/{{ item.dst }}" dest: "/etc/systemd/network/{{ item.dst }}"
@ -83,6 +85,7 @@
- {src: coreos-interface-macvlan.cfg, dst: output.network } - {src: coreos-interface-macvlan.cfg, dst: output.network }
- {src: coreos-network-macvlan.cfg, dst: macvlan.network } - {src: coreos-network-macvlan.cfg, dst: macvlan.network }
notify: Macvlan | restart network notify: Macvlan | restart network
when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"] when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
- name: Macvlan | Install cni definition for Macvlan - name: Macvlan | Install cni definition for Macvlan