Updated shebang

Author: Rohan-sss1

roles/aviconfig/tasks/upgradeprofile.yml

@@ -14,7 +14,6 @@
     api_context: "{{ avi_api_context | default(omit) }}"
     avi_api_update_method: "{{ item.avi_api_update_method | default(omit) }}"
     avi_api_patch_op: "{{ item.avi_api_patch_op | default(omit) }}"
-    controller: "{{ item.controller | default(omit) }}"
     dry_run: "{{ item.dry_run | default(omit) }}"
     image: "{{ item.image | default(omit) }}"
     pre_checks: "{{ item.pre_checks | default(omit) }}"

roles/aviconfig/tasks/upgradeprofile_delete.yml

@@ -14,7 +14,6 @@
     state: "{{ avi_role_state_mode }}"
     avi_api_update_method: "{{ item.avi_api_update_method | default(omit) }}"
     avi_api_patch_op: "{{ item.avi_api_patch_op | default(omit) }}"
-    controller: "{{ item.controller | default(omit) }}"
     dry_run: "{{ item.dry_run | default(omit) }}"
     image: "{{ item.image | default(omit) }}"
     pre_checks: "{{ item.pre_checks | default(omit) }}"

roles/avise/files/systemd/avi_host_server.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 ############################################################################
 # ========================================================================
 # Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
@@ -50,7 +51,7 @@
 logger = logging.getLogger()
 logger.setLevel(logging.DEBUG)
 # 20MB file limit for logging
-handler = RotatingFileHandler(log_file, maxBytes=20*1024*1024, backupCount=1)
+handler = RotatingFileHandler(log_file, maxBytes=20 * 1024 * 1024, backupCount=1)
 formatter = logging.Formatter("%(asctime)s - %(message)s")
 handler.setFormatter(formatter)
 logger.addHandler(handler)
@@ -116,7 +117,7 @@ def create_uds_socket():
             logger.error(
                 "Failed to unlink domain stream socket: %s", exception)
             raise Exception(
-                "Failed to unlink domain stream socket: %s", exception)
+                "Failed to unlink domain stream socket: {}".format(exception))
 
     # Create a UDS socket
     try:
@@ -126,7 +127,7 @@ def create_uds_socket():
         sock.listen(1)
         logger.info("Listening on %s", SERVER_ADDRESS)
         return sock
-    except:
+    except Exception as ex:
         exception = traceback.format_exc()
         logger.error("socket listen failed: %s", exception)
         raise Exception("socket listen failed: {}".format(exception))

roles/avise/files/systemd/avihost_service_script.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/sh
 ############################################################################
 # ========================================================================
 # Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
@@ -7,7 +7,7 @@
 
 start()
 {
-    if [[ -f /opt/avitest_python_version ]]; then
+    if [ -f /opt/avitest_python_version ]; then
         # For testing against python2 and python3
         version=$(cat /opt/avitest_python_version)
     else
@@ -18,8 +18,8 @@ start()
         command -v python3 >/dev/null 2>&1 && version='3'
     fi
 
-    if [[ $version != '0' ]]; then
-        exec python$version /usr/sbin/avi_host_server.py
+    if [ "$version" != '0' ]; then
+        exec python"$version" /usr/sbin/avi_host_server.py
     else
         echo "Unable to find any installed python"
         exit 1

roles/avise/files/systemd/install.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
 ############################################################################
 # ========================================================================
 # Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential

roles/avise/files/systemd/install.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ############################################################################
 # ========================================================================
 # Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
@@ -7,16 +7,16 @@
 
 set -e
 echo "Migrating avihost service files."
-major_version=`cat /bootstrap/VERSION | grep Version | awk '{print $2}' | awk '{split($0,a,".");}{print a[1]}'`
+major_version=$(cat /bootstrap/VERSION | grep Version | awk '{print $2}' | awk '{split($0,a,".");}{print a[1]}')
 BASEDIR=$(dirname "$0")
 
 python_cmd='python3'
-if [ $major_version -lt 20 ]
+if [ "$major_version" -lt 20 ]
 then
    echo "using python2"
    python_cmd="python"
 fi
 
-$python_cmd $BASEDIR/install.py
+"$python_cmd" "$BASEDIR"/install.py
 
 echo "Completed: Migration of avihost service files." 

roles/avise/tasks/docker/docker_checks.yml

@@ -119,5 +119,3 @@
     - name: Include error tasks if Docker disk size is insufficient
       ansible.builtin.include_tasks: error.yml
   when: docker_size_avail is defined and docker_size_avail|int < docker_size_req|int
-
-

roles/avise/tasks/main.yml

@@ -5,4 +5,3 @@
 # It was added to prevent mass "skipped" messages when deploying Avi.
 - name: Avi SE | Deployment
   include_tasks: docker/main.yml
-

tests/sanity/ignore-2.15.txt

@@ -59,6 +59,7 @@ plugins/modules/verify_se.py validate-modules:missing-gplv3-license
 roles/avicontroller/templates/avicontroller.j2 shebang
 roles/avise/templates/avise.j2 shebang
 roles/avise/templates/avise_service.j2 shebang
+roles/avise/files/systemd/avihost.service shebang
 molecule/default/files/avi_config.yml line-endings
 tests/unit/modules/test_avi_pool.py pylint!skip
 roles/avise/files/systemd/install.py pylint!skip
@@ -411,4 +412,5 @@ plugins/modules/avi_trustedhostprofile.py import-3.10!skip
 plugins/modules/avi_upgradeprofile.py import-3.10!skip
 plugins/modules/avi_tenantsystemconfiguration.py validate-modules:import-error
 plugins/modules/avi_tenantsystemconfiguration.py validate-modules:missing-gplv3-license
-plugins/modules/avi_bootstrap_controller.py validate-modules:no-default-for-required-parameter
+plugins/modules/avi_bootstrap_controller.py validate-modules:no-default-for-required-parameter
+plugins/modules/avi_csrfpolicy.py yamllint!skip