synchro with bitbucket 2.1.1

Dockerfiles/Dockerfile-awx_task.tag

@@ -3,7 +3,7 @@ FROM ansible/awx_task:9.0.1
 
 USER root
 
-ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.0
+ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.1
 
 COPY ansible.credentials.py /etc/tower/conf.d/credentials.py
 COPY ansible.env /etc/tower/conf.d/environment.sh

Dockerfiles/Dockerfile-awx_web.tag

@@ -3,7 +3,7 @@ FROM ansible/awx_web:9.0.1
 
 USER root 
 
-ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.0
+ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.1
 
 # security
 COPY ansible.credentials.py /etc/tower/conf.d/credentials.py

Dockerfiles/Dockerfile-zabbix-agent.tag

@@ -3,7 +3,7 @@ FROM zabbix/zabbix-agent:centos-4.4.1
 
 USER root 
 
-ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.0
+ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.1
 
 ENV PYTHONWARNINGS="ignore:Unverified HTTPS request"
 

Dockerfiles/Dockerfile-zabbix-web.tag

@@ -1,7 +1,7 @@
 #set base image 
 FROM zabbix/zabbix-web-nginx-pgsql:centos-4.4.1
 
-ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.0
+ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.1
 
 COPY items.inc.php           /usr/share/zabbix/include/
 COPY logo-header.svg         /usr/share/zabbix/assets/img/

Dockerfiles/Dockerfile-zabbix.tag

@@ -3,7 +3,7 @@ FROM zabbix/zabbix-server-pgsql:centos-4.4.1
 
 USER root 
 
-ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.0
+ENV MISM_BULLSEQUANA_EDGE_VERSION=2.1.1
 
 ENV PYTHONWARNINGS="ignore:Unverified HTTPS request"
 

Dockerfiles/loginModal.partial.html

@@ -110,7 +110,7 @@
                 </div>
             </div>
             <div class="LoginModal-footer">
-                version: 2.1.0
+                version: 2.1.1
             </div>
         </div>
    </div>

ansible/playbooks/openbmc/utils/utils_evaluate_firmware_update.yml

@@ -38,7 +38,7 @@
       item.value.Activation == "xyz.openbmc_project.Software.Activation.Activations.Active" and
       item.value.RequestedActivation == "xyz.openbmc_project.Software.Activation.RequestedActivations.None"
 
-  - name: Load functional firmwares from Technical State xml file
+  - name: Compare functional firmwares to Technical State xml file
     local_action: atos_openbmc technical_state_path={{ technical_state_path }} category=Update command=EvaluateFirmwareUpdate firmwares={{ firmware_inventory }}
     register: result_evaluate_firmware_update
     when: check_technical_state_path_exists.stat.exists == True and check_technical_state_path_exists.stat.isdir == True

start_awx.sh

@@ -3,7 +3,7 @@
 . ./proxy.sh
 . ./versions.sh
 
-export unless_stopped_or_no=unless_stopped
+export always_or_no=always
 ./update_awx_containers_restart_option.sh
 
 echo "starting BullSequana Edge Ansible AWX containers ...."

start_zabbix.sh

@@ -22,7 +22,7 @@ echo $timezone
 . ./proxy.sh
 . ./versions.sh
 
-export unless_stopped_or_no=unless_stopped
+export always_or_no=always
 ./update_zabbix_containers_restart_option.sh
 
 echo "starting MISM containers ...."

stop_zabbix.sh

@@ -2,7 +2,6 @@
 
 . ./versions.sh
 
-
 export always_or_no=no
 ./update_zabbix_containers_restart_option.sh
 

update_zabbix_containers_restart_option.sh

@@ -2,33 +2,33 @@
 
 . ./versions.sh
 
-echo "updating restart=$unless_stopped_or_no option BullSequana Edge Ansible AWX containers ...."
+echo "updating restart=$always_or_no option BullSequana Edge Ansible Zabbix containers ...."
 
 export docker_container=`docker container list |grep $MISM_BULLSEQUANA_EDGE_VERSION |grep 'zabbix-web' |awk '{ print $2; }'`
 if [ ! -z "$docker_container" ] 
 then
-    echo "updating restart=$unless_stopped_or_no option for zabbix-web container...."
-    docker update --restart=$unless_stopped_or_no zabbix-web
+    echo "updating restart=$always_or_no option for zabbix-web container...."
+    docker update --restart=$always_or_no zabbix-web
 fi
 
 export docker_container=`docker container list |grep $MISM_BULLSEQUANA_EDGE_VERSION |grep 'zabbix-server' |awk '{ print $2; }'`
 if [ ! -z "$docker_container" ] 
 then
-    echo "updating restart=$unless_stopped_or_no option for zabbix-server container...."
-    docker update --restart=$unless_stopped_or_no zabbix-server
+    echo "updating restart=$always_or_no option for zabbix-server container...."
+    docker update --restart=$always_or_no zabbix-server
 fi
 
 export docker_container=`docker container list |grep $MISM_BULLSEQUANA_EDGE_VERSION |grep 'zabbix-agent' |awk '{ print $2; }'`
 if [ ! -z "$docker_container" ] 
 then
-    echo "updating restart=$unless_stopped_or_no option for zabbix-agent container...."
-    docker update --restart=$unless_stopped_or_no zabbix-agent
+    echo "updating restart=$always_or_no option for zabbix-agent container...."
+    docker update --restart=$always_or_no zabbix-agent
 fi
 
 export docker_container=`docker container list |grep $POSTGRES_ZABBIX_BULLSEQUANA_EDGE_VERSION |grep 'zabbix-postgres' |awk '{ print $2; }'`
 if [ ! -z "$docker_container" ] 
 then
-    echo "updating restart=$unless_stopped_or_no option for zabbix-postgres container...."
-    docker update --restart=$unless_stopped_or_no zabbix-postgres
+    echo "updating restart=$always_or_no option for zabbix-postgres container...."
+    docker update --restart=$always_or_no zabbix-postgres
 fi
 

versions.sh

@@ -1,4 +1,4 @@
-export MISM_BULLSEQUANA_EDGE_VERSION=2.1.0
+export MISM_BULLSEQUANA_EDGE_VERSION=2.1.1
 export MISM_TAG_BULLSEQUANA_EDGE_VERSION=tag
 export AWX_BULLSEQUANA_EDGE_VERSION=9.0.1
 export RABBITMQ_AWX_BULLSEQUANA_EDGE_VERSION=3.8.1-management