diff --git a/.gitignore b/.gitignore index 962ed6c..c7b76a8 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ ansible/plugins/inventory/ansible-inventory-cache # some readme *-readme.md # some tests +tests/ +test/ test-* test_* diff --git a/Dockerfiles/loginModal.partial.html b/Dockerfiles/loginModal.partial.html index 37647a4..2d8b6e5 100644 --- a/Dockerfiles/loginModal.partial.html +++ b/Dockerfiles/loginModal.partial.html @@ -110,7 +110,7 @@ diff --git a/ansible/playbooks/openbmc/utils/should_poweroff.yml b/ansible/playbooks/openbmc/utils/should_poweroff.yml index 4024dbd..021b984 100644 --- a/ansible/playbooks/openbmc/utils/should_poweroff.yml +++ b/ansible/playbooks/openbmc/utils/should_poweroff.yml @@ -5,7 +5,11 @@ should_poweroff: True when: > item.name is defined and - item.name == "xyz.openbmc_project.Software.Version.VersionPurpose.Host" + ( + item.name == "xyz.openbmc_project.Software.Version.VersionPurpose.Host" + or + item.name == "xyz.openbmc_project.Software.Version.VersionPurpose.CPLD" + ) with_items: "{{ evaluate_firmware_update }}" - name: Determine if Host should be powered off @@ -14,8 +18,8 @@ verbosity: 2 when: should_poweroff is defined and should_poweroff == True - - name: Check if BIOS (Host) update is possible and forceoff is True - fail: msg="Global Update stopped - Your environment variable forceoff is False and Host should be powered off => Cannot update BIOS" + - name: Check if BIOS / CPLD update is possible and forceoff is True + fail: msg="Global Update stopped - Your environment variable forceoff is False and Host should be powered off => Cannot update BIOS/CPLD" when: forceoff == False and should_poweroff is defined and should_poweroff == True - include_tasks: utils_chassis_power_off.yml diff --git a/install.sh b/install.sh index ffa1bfa..51720f1 100755 --- a/install.sh +++ b/install.sh @@ -14,5 +14,3 @@ done ./install_awx.sh ./install_zabbix.sh -echo -e "\033[32mYou can now remove safely your old tar and tar.gz file\033[0m" - diff --git a/install_awx.sh b/install_awx.sh index ea7d4e0..3696d74 100755 --- a/install_awx.sh +++ b/install_awx.sh @@ -95,6 +95,15 @@ fi echo "starting BullSequana Edge Ansible AWX containers ...." docker-compose -f docker_compose_awx.yml up -d +rm -f bullsequana-edge-system-management_awx_web.*.tar +rm -f bullsequana-edge-system-management_awx_task.*.tar +rm -f awx_web.*.tar +rm -f awx_task.*.tar +rm -f rabbitmq.*.tar +rm -f memcached.*.tar +rm -f postgres.*.tar +rm -f pgadmin4.*.tar + echo "----------------------------------------------------------------------------------------------------" echo "now wait 10 minutes for the migration to complete...." echo "check the login page at https://localhost" diff --git a/install_zabbix.sh b/install_zabbix.sh index 744a360..7ab584c 100755 --- a/install_zabbix.sh +++ b/install_zabbix.sh @@ -99,6 +99,14 @@ fi echo "starting BullSequana Edge Zabbix containers ...." docker-compose -f docker_compose_zabbix.yml up -d +rm -f bullsequana-edge-system-management_zabbix-web.*.tar +rm -f bullsequana-edge-system-management_zabbix-web.*.tar +rm -f bullsequana-edge-system-management_zabbix-agent.*.tar +rm -f zabbix-server-pgsql.*.tar +rm -f zabbix-web-nginx-pgsql.*.tar +rm -f zabbix-agent.*.tar +rm -f postgres.*.tar + echo "---------------------------------------------------------------------------------------------------" echo "Zabbix is available on https://localhost:4443" echo "for more info, refer to github site https://github.com/atosorigin/bullsequana-edge-system-management" diff --git a/versions.sh b/versions.sh index e89ba33..4c4449d 100755 --- a/versions.sh +++ b/versions.sh @@ -1,9 +1,9 @@ -export MISM_BULLSEQUANA_EDGE_VERSION=2.1.0 -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 -export POSTGRES_AWX_BULLSEQUANA_EDGE_VERSION=12.0-alpine -export PGADMIN_AWX_BULLSEQUANA_EDGE_VERSION=4.14 -export MEMCACHED_AWX_BULLSEQUANA_EDGE_VERSION=1.5.20-alpine -export ZABBIX_BULLSEQUANA_EDGE_VERSION=centos-4.4.1 -export POSTGRES_ZABBIX_BULLSEQUANA_EDGE_VERSION=12.0-alpine +export MISM_BULLSEQUANA_EDGE_VERSION=latest +export MISM_TAG_BULLSEQUANA_EDGE_VERSION=latest +export AWX_BULLSEQUANA_EDGE_VERSION=latest +export RABBITMQ_AWX_BULLSEQUANA_EDGE_VERSION=latest +export POSTGRES_AWX_BULLSEQUANA_EDGE_VERSION=latest +export PGADMIN_AWX_BULLSEQUANA_EDGE_VERSION=latest +export MEMCACHED_AWX_BULLSEQUANA_EDGE_VERSION=latest +export ZABBIX_BULLSEQUANA_EDGE_VERSION=latest +export POSTGRES_ZABBIX_BULLSEQUANA_EDGE_VERSION=latest