From 94120302d3154f80f9d82583abc08b6a5fec81e6 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Tue, 13 Mar 2018 00:34:04 +0000 Subject: [PATCH] Pull syncd-rpc with sonic version tag Signed-off-by: Qi Luo --- ansible/roles/sonic-common/tasks/snmp.yml | 2 +- ansible/swap_syncd.yml | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ansible/roles/sonic-common/tasks/snmp.yml b/ansible/roles/sonic-common/tasks/snmp.yml index 1cad998cf19..02a15c51aa5 100644 --- a/ansible/roles/sonic-common/tasks/snmp.yml +++ b/ansible/roles/sonic-common/tasks/snmp.yml @@ -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 diff --git a/ansible/swap_syncd.yml b/ansible/swap_syncd.yml index 3c1eeb80fad..5ac16fb116e 100644 --- a/ansible/swap_syncd.yml +++ b/ansible/swap_syncd.yml @@ -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