Merge pull request #42 from avinetworks/rc-20.1.5

updating with 20.1.5 assets
avinetworks · Apr 16, 2021 · 0b81a38 · 0b81a38
2 parents 7e2cfb2 + 3a94779
commit 0b81a38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/files/systemd/avihost.service b/files/systemd/avihost.service
@@ -5,8 +5,8 @@ Description=Avi Host Service
 TimeoutStartSec=0
 Restart=always
 
-ExecStart=/usr/sbin/avi_host_server.py
-ExecStop=pkill -f avi_host_server.py
+ExecStart=/bin/sh -c "python3 /usr/sbin/avi_host_server.py"
+ExecStop=/bin/sh -c "pkill -f avi_host_server.py"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/tasks/docker/dpdk.yml b/tasks/docker/dpdk.yml
@@ -46,6 +46,8 @@
          (not (ansible_distribution == 'RedHat' and ansible_distribution_version is match('7.2'))) and
          (not (ansible_distribution == 'RedHat' and ansible_distribution_version is match('7.1'))) and
          (not (ansible_distribution == 'RedHat' and ansible_distribution_version is match('7.0'))) and
+         (not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is match('20.04'))) and
+         (not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is match('18.04'))) and
          (not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is match('16.04')))
 
 - name: Avi SE | Perform specific os tasks

diff --git a/tasks/docker/version_check.yml b/tasks/docker/version_check.yml
@@ -46,5 +46,7 @@
          (not (ansible_distribution == 'RedHat' and ansible_distribution_version is match('7.2'))) and
          (not (ansible_distribution == 'RedHat' and ansible_distribution_version is match('7.1'))) and
          (not (ansible_distribution == 'RedHat' and ansible_distribution_version is match('7.0'))) and
+         (not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is match('20.04'))) and
+         (not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is match('18.04'))) and
          (not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is match('16.04'))) and
          (not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is match('14.04')))