Skip to content

Rename docker orchagent to docker swss #82

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

Merged
stcheng merged 1 commit into from
Jan 10, 2017
Merged

Rename docker orchagent to docker swss #82

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
16 changes: 13 additions & 3 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 @@ -33,7 +33,7 @@

# Install docker containers
- name: Start syncd docker container
include: ../../sonic-common/tasks/sonicdocker.yml
include: sonicdocker.yml
vars:
docker_container: syncd
docker_image: "{{ image_id_syncd_rpc if host_saithrift is defined else image_id_syncd }}"
Expand All @@ -57,12 +57,22 @@
group=root
mode=0755

- name: Start orchagent docker container
include: ../../sonic-common/tasks/sonicdocker.yml
# Remove deprecated orchagent container
- name: Remove orchagent docker container
include: sonicdocker.yml
vars:
docker_container: orchagent
docker_image: "{{ image_id_orchagent }}"
docker_privileged: yes
docker_state: absent
tags: orchagent

- name: Start swss docker container
include: sonicdocker.yml
vars:
docker_container: swss
docker_image: "{{ image_id_orchagent }}"
docker_privileged: yes
docker_state: reloaded
docker_volumes: "{{ orchagent_docker_volumes }}"
docker_volumes_from:
Expand Down
16 changes: 13 additions & 3 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 @@ -26,7 +26,7 @@

# Install docker containers
- name: Start syncd docker container
include: ../../sonic-common/tasks/sonicdocker.yml
include: sonicdocker.yml
vars:
docker_container: syncd
docker_image: "{{ image_id_syncd_mlnx_rpc if host_saithrift is defined else image_id_syncd_mlnx }}"
Expand All @@ -37,12 +37,22 @@
- database
tags: syncd

- name: Start orchagent docker container
include: ../../sonic-common/tasks/sonicdocker.yml
# Remove deprecated orchagent container
- name: Remove orchagent docker container
include: sonicdocker.yml
vars:
docker_container: orchagent
docker_image: "{{ image_id_orchagent_mlnx }}"
docker_privileged: yes
docker_state: absent
tags: orchagent

- name: Start swss docker container
include: sonicdocker.yml
vars:
docker_container: swss
docker_image: "{{ image_id_orchagent_mlnx }}"
docker_privileged: yes
docker_state: reloaded
docker_volumes: "{{ orchagent_docker_volumes }}"
docker_volumes_from:
Expand Down
6 changes: 3 additions & 3 deletions ...templates/etc/systemd/system/orchagent.j2 → ...icv2/templates/etc/systemd/system/swss.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[Unit]
Description=orchagent container
Description=switch state service container
Requires=database.service
After=database.service

[Service]
User={{ sonicadmin_user }}
ExecStart=/usr/bin/docker start -a orchagent
ExecStop=/usr/bin/docker stop orchagent
ExecStart=/usr/bin/docker start -a swss
ExecStop=/usr/bin/docker stop swss
ExecStopPost=/usr/bin/docker stop syncd

[Install]
Expand Down