Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

- name: backup config_db.json
shell: cp /etc/sonic/config_db.json /etc/sonic/config_db.json.bak
become: yes
ignore_errors: yes

- name: generate config_db.json
shell: sonic-cfggen -H -j /tmp/base_config.json --print-data > /etc/sonic/config_db.json
Expand All @@ -35,23 +37,23 @@
block:
- name: disable feature teamd
shell: config feature state teamd disabled
become: true
become: yes
- name: ensure teamd container is stopped
docker_container:
name: teamd
state: stopped
become: true
become: yes
ignore_errors: yes
- name: remove teamd container
docker_container:
name: teamd
state: absent
become: true
become: yes
when: teamd_container.stdout != ""

- name: SONiC update config db
shell: config reload -y -f
become: true
become: yes

- name: wait for SONiC update config db finish
pause:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
{% if device_port_vlans[port_name]["mode"].lower() == "access" %}
{% if ns.notFirstPrinted %},
{% endif %}
"Vlan{{ device_port_vlans[port_name]["vlanids"] }}|{{ port_name }}": {
"Vlan{{ device_port_vlans[port_name]["vlanids"] }}|{{ lookup("cisco_8101_port_convert", port_name, speed=device_conn[port_name]["speed"], output="sonic") }}": {
"tagging_mode": "untagged"
}{% if ns.update({"notFirstPrinted": True}) %} {% endif %}
{% elif device_port_vlans[port_name]["mode"].lower() == "trunk" %}
{% for vlanid in device_port_vlans[port_name]["vlanlist"] %}
{% if ns.notFirstPrinted %},
{% endif %}
"Vlan{{ vlanid }}|{{ port_name }}": {
"Vlan{{ vlanid }}|{{ lookup("cisco_8101_port_convert", port_name, speed=device_conn[port_name]["speed"], output="sonic") }}": {
"tagging_mode": "tagged"
}{% if ns.update({"notFirstPrinted": True}) %} {% endif %}
{% endfor %}
Expand Down
Loading