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
2 changes: 1 addition & 1 deletion ansible/roles/sonic-common/tasks/snmp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
setup:

- name: Gather SONiC base image version
shell: grep -E "menuentry ['](ACS)|(SONiC)-OS" /host/grub/grub.cfg | awk '{print $2}' | sed 's/'\''//g'
shell: grep -E "^menuentry [']((ACS)|(SONiC))-OS-" /host/grub/grub.cfg | awk '{print $2}' | sed 's/'\''//g'
become: true
register: result
changed_when: false
Expand Down
14 changes: 12 additions & 2 deletions ansible/swap_syncd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,21 @@
value: 509430500
sysctl_set: yes

- name: Gather SONiC base image version
shell: grep -E "^menuentry [']((ACS)|(SONiC))-OS-" /host/grub/grub.cfg | awk '{print $2}' | sed 's/'\''//g'
become: true
register: result
changed_when: false

- name: Set base image verison variable
set_fact:
sonic_image_version: "{{ result.stdout | regex_replace('.+-([^-]+)$', '\\1') }}"

- name: Pull syncd-rpc docker from registry
shell: docker login -u {{docker_registry_username}} -p {{docker_registry_password}} -e "@" {{docker_registry_host}}; docker pull {{docker_registry_host}}/{{docker_rpc_image_name}}
shell: docker login -u {{docker_registry_username}} -p {{docker_registry_password}} {{docker_registry_host}}; docker pull {{docker_registry_host}}/{{docker_rpc_image_name}}:{{sonic_image_version}}

- name: Tag pulled images as syncd
shell: docker tag {{docker_registry_host}}/{{docker_rpc_image_name}} {{docker_syncd_name}}
shell: docker tag {{docker_registry_host}}/{{docker_rpc_image_name}}:{{sonic_image_version}} {{docker_syncd_name}}

- name: Start swss service
become: true
Expand Down