Fixes for AS7512 deployment (#102)

* Change platform modules to correct package name

Signed-off-by: Nadiya.Stetskovych <[email protected]>

* Add check copying ssw folder for AS7512 platform as it use ssw files from ssw_extra

Signed-off-by: Nadiya.Stetskovych <[email protected]>

* Sync with (#82) (rename orchagent)

Signed-off-by: Nadiya.Stetskovych <[email protected]>

Author: Nadiya

ansible/roles/sonic-common/tasks/main.yml

@@ -190,6 +190,7 @@
         group=root
         mode=0644
   tags: ssw
+  when: sonic_hwsku != "AS7512"
 
 # Setup Platform
 - include: platform.yml

ansible/roles/sonic-common/tasks/platform-cavm.yml

@@ -1,7 +1,7 @@
 # Ensure Platform Modules for as7512 are installed
 - name: Confirm Platform Modules are installed
   become: true
-  apt: pkg=cavm_platform_modules
+  apt: pkg=cavm-platform-modules
        state=present
        force=yes
 

ansible/roles/sonicv2/tasks/main.yml

@@ -30,6 +30,7 @@
         group=root
         mode=0644
   tags: ssw
+  when: sonic_hwsku != "AS7512"
 
 # SONiC
 - include: sonic-brcm.yml

ansible/roles/sonicv2/tasks/sonic-cavm.yml

@@ -30,12 +30,22 @@
   when: host_saithrift is not defined
   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_cavm }}"
     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_cavm }}"
+    docker_privileged: yes
     docker_state: reloaded
     docker_volumes: "{{ orchagent_docker_volumes }}"
     docker_volumes_from: