Merge pull request #46 from avinetworks/rc-21.1.4

updating with 21.1.4 assets
avinetworks · Apr 8, 2022 · 051e644 · 051e644
2 parents cce7e4e + 117a055
commit 051e644
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 25 deletions.
diff --git a/files/systemd/avi_host_server.py b/files/systemd/avi_host_server.py
@@ -1,14 +1,9 @@
 ############################################################################
 # ========================================================================
-# Copyright 2021 VMware, Inc.  All rights reserved. VMware Confidential
+# Copyright 2022 VMware, Inc.  All rights reserved. VMware Confidential
 # ========================================================================
 ###
 
-#**************************************************************************
-# ------------------------------------------------------------------------
-# Copyright 2021 VMware, Inc.  All rights reserved. VMware Confidential
-# ------------------------------------------------------------------------
-#*
 
 """
 What is the service functionality?

diff --git a/files/systemd/avihost_service_script.sh b/files/systemd/avihost_service_script.sh
@@ -1,16 +1,10 @@
 #!/bin/bash -x
-
 ############################################################################
 # ========================================================================
-# Copyright 2021 VMware, Inc.  All rights reserved. VMware Confidential
+# Copyright 2022 VMware, Inc.  All rights reserved. VMware Confidential
 # ========================================================================
 ###
 
-#***************************************************************************
-# ------------------------------------------------------------------------
-# Copyright 2021 VMware, Inc.  All rights reserved. VMware Confidential
-# ------------------------------------------------------------------------
-#
 
 start()
 {

diff --git a/files/systemd/install.py b/files/systemd/install.py
@@ -1,10 +1,9 @@
 #!/usr/bin/python3
-
 ############################################################################
-# ------------------------------------------------------------------------
-# Copyright 2021 VMware, Inc.  All rights reserved. VMware Confidential
-# ------------------------------------------------------------------------
-#############################################################################
+# ========================================================================
+# Copyright 2022 VMware, Inc.  All rights reserved. VMware Confidential
+# ========================================================================
+###
 
 """
 ===================================

diff --git a/files/systemd/install.sh b/files/systemd/install.sh
@@ -1,10 +1,10 @@
-
 #!/bin/bash
 ############################################################################
-# ------------------------------------------------------------------------
-# Copyright 2021 VMware, Inc.  All rights reserved. VMware Confidential
-# ------------------------------------------------------------------------
+# ========================================================================
+# Copyright 2022 VMware, Inc.  All rights reserved. VMware Confidential
+# ========================================================================
 ###
+
 set -e
 echo "Migrating avihost service files."
 major_version=`cat /bootstrap/VERSION | grep Version | awk '{print $2}' | awk '{split($0,a,".");}{print a[1]}'`

diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
@@ -1,7 +1,6 @@
-
 ############################################################################
 # ========================================================================
-# Copyright 2021 VMware, Inc.  All rights reserved. VMware Confidential
+# Copyright 2022 VMware, Inc.  All rights reserved. VMware Confidential
 # ========================================================================
 ###
 

diff --git a/templates/avise.j2 b/templates/avise.j2
@@ -208,7 +208,8 @@ case "$1" in
     else
       wait_till_service_starts ${cont_plat}
     fi
-    se_docker_run_params="{{ AVI_RUN_PARAMS }}"
+# AV-135987 - Don't indent, causing regex parsing issue in controller
+se_docker_run_params="{{ AVI_RUN_PARAMS }}"
     $1
     ;;
   *)