Skip to content

[sonicdocker] Change container task order due to service dependencies #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NStetskovych-zz wants to merge 1 commit into from
Closed

[sonicdocker] Change container task order due to service dependencies #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions ansible/roles/sonicv2/tasks/sonic-brcm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,6 @@
default_release={{ apt_default_release }}
force=yes

# Install docker containers
- name: Start syncd docker container
include: sonicdocker.yml
vars:
docker_container: syncd
docker_image: "{{ image_id_syncd_rpc if host_saithrift is defined else image_id_syncd }}"
docker_privileged: yes
docker_state: reloaded
docker_volumes: "{{ syncd_docker_volumes }}"
docker_volumes_from:
- database
tags: syncd

- name: Remove old copies of bcmcmd
become: true
file: path=/usr/sbin/bcmcmd
Expand Down Expand Up @@ -78,3 +65,17 @@
docker_volumes_from:
- database
tags: orchagent

# Install docker containers
- name: Start syncd docker container
include: sonicdocker.yml
vars:
docker_container: syncd
docker_image: "{{ image_id_syncd_rpc if host_saithrift is defined else image_id_syncd }}"
docker_privileged: yes
docker_state: reloaded
docker_volumes: "{{ syncd_docker_volumes }}"
docker_volumes_from:
- database
tags: syncd

29 changes: 15 additions & 14 deletions ansible/roles/sonicv2/tasks/sonic-cavm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@
src: ssw_extra/{{ sonic_hwsku }}/port_config_{{ sonic_portsku }}.ini
dest: /etc/ssw/{{ sonic_hwsku }}/port_config.ini

# Install docker containers
- name: Start syncd docker container
include: sonicdocker.yml
vars:
docker_container: syncd
docker_image: "{{ image_id_syncd_cavm }}"
docker_privileged: yes
docker_state: reloaded
docker_volumes: "{{ syncd_docker_volumes }}"
docker_volumes_from:
- database
when: host_saithrift is not defined
tags: syncd

# Remove deprecated orchagent container
- name: Remove orchagent docker container
include: sonicdocker.yml
Expand All @@ -51,3 +37,18 @@
docker_volumes_from:
- database
tags: orchagent

# Install docker containers
- name: Start syncd docker container
include: sonicdocker.yml
vars:
docker_container: syncd
docker_image: "{{ image_id_syncd_cavm }}"
docker_privileged: yes
docker_state: reloaded
docker_volumes: "{{ syncd_docker_volumes }}"
docker_volumes_from:
- database
when: host_saithrift is not defined
tags: syncd

27 changes: 14 additions & 13 deletions ansible/roles/sonicv2/tasks/sonic-mlnx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,6 @@
default_release={{ apt_default_release }}
force=yes

# Install docker containers
- name: Start syncd docker container
include: sonicdocker.yml
vars:
docker_container: syncd
docker_image: "{{ image_id_syncd_mlnx_rpc if host_saithrift is defined else image_id_syncd_mlnx }}"
docker_privileged: yes
docker_state: reloaded
docker_volumes: "{{ syncd_docker_volumes }}"
docker_volumes_from:
- database
tags: syncd

# Remove deprecated orchagent container
- name: Remove orchagent docker container
include: sonicdocker.yml
Expand All @@ -58,3 +45,17 @@
docker_volumes_from:
- database
tags: orchagent

# Install docker containers
- name: Start syncd docker container
include: sonicdocker.yml
vars:
docker_container: syncd
docker_image: "{{ image_id_syncd_mlnx_rpc if host_saithrift is defined else image_id_syncd_mlnx }}"
docker_privileged: yes
docker_state: reloaded
docker_volumes: "{{ syncd_docker_volumes }}"
docker_volumes_from:
- database
tags: syncd