Merge branch 'openstack_install_8.0.0' of github.com:SovereignCloudSt…

…ack/hardware-landscape into openstack_install_8.0.0
SovereignCloudStack · Sep 19, 2024 · ea3d38b · ea3d38b
2 parents b10cebd + 82e1776
commit ea3d38b
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 5 deletions.
diff --git a/documentation/System_Deployment.md b/documentation/System_Deployment.md
@@ -173,3 +173,14 @@ For the steps described in the osd configurtion there are the following exceptio
    git push
    ```
 
+### Step 5: Validate the Installation
+
+* Run the Postinstallation validation
+  ```
+  osism apply scs_check_postinstall
+  ```
+* Run the OSISM validations
+  ```
+  /opt/configuration/misc/run_validations.sh
+  ```
+
diff --git a/environments/configuration.yml b/environments/configuration.yml
@@ -45,7 +45,8 @@ squid_tag: edge
 ##########################
 # system settings
 motd_show_ssh: true
-network_interface: dummy0
+network_interface: "dummy0"
+
 
 #osism_setup_gather_subset:
 # - "!network_switches"
@@ -73,6 +74,7 @@ cluster_cidr: "10.52.0.0/16"
 cilium_mode: "native"
 
 k3s_interface: "dummy0"
+
 #kube_vip_iface: "dummy0"
 #calico_iface: "dummy0"
 #flannel_iface: "dummy0"
@@ -243,6 +245,11 @@ hosts_additional_entries:
 ##########################
 # ceph
 
+# TODO: can be removed when the follwing PR is released: 
+monitor_interface: "dummy0"
+radosgw_interface: "dummy0"
+rgw_multisite: false
+
 ceph_cluster_fsid: 44bc2d19-fd83-4b92-a6c4-eed358e35672
 # BEGIN: TLS
 certificates_ca:

diff --git a/environments/custom/playbook-scs_check_postinstall.yml b/environments/custom/playbook-scs_check_postinstall.yml
@@ -10,3 +10,10 @@
       ansible.builtin.command: /usr/local/scripts/scs_check_network_connectivity.sh
     - name: Check services - /usr/local/scripts/scs_check_services.sh
       ansible.builtin.command: /usr/local/scripts/scs_check_services.sh
+
+- name: Check the state of all openstack after installation
+  hosts: manager
+  gather_facts: no
+  tasks:
+    - name: Check openstack - /usr/local/scripts/scs_check_openstack.sh
+      ansible.builtin.command: /usr/local/scripts/scs_check_openstack.sh
diff --git a/environments/custom/roles/scs-landscape-nodes/files/scripts/scs_check_openstack.sh b/environments/custom/roles/scs-landscape-nodes/files/scripts/scs_check_openstack.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+FAILED=""
+
+if [ $(openstack compute service list --os-cloud admin -f json|jq '.[] | select(.Status != "enabled" or .State != "up")'|wc -l) -gt 0 ];then
+	FAILED="NODES-DOWN"
+	openstack compute service list --os-cloud admin
+fi	
+
+if [ -z "FAILED" ];then
+	echo "FAILED: $FAILED"
+	exit 1
+fi
diff --git a/environments/custom/roles/scs-mgr-httpd/templates/docker-compose.yml.j2 b/environments/custom/roles/scs-mgr-httpd/templates/docker-compose.yml.j2
@@ -5,7 +5,7 @@ services:
     restart: unless-stopped
     image: "{{ httpd_image }}"
     ports:
-      - "18080:80"
+      - "28080:80"
     volumes:
       - "{{ httpd_configuration_directory }}/httpd.conf:/usr/local/apache2/conf/httpd.conf:ro"
       - "{{ httpd_media_directory }}/:/srv/:ro" 

diff --git a/inventory/20-roles b/inventory/20-roles
@@ -45,7 +45,7 @@ st01-mgmt-r01-u30
 # Nodes which are intended for monitoring services belong to
 # this group
 [monitoring]
-#st01-mgmt-r01-u31
+st01-mgmt-r01-u31
 
 # Nodes that serve as controllers, so things like scheduler,
 # API or database run there, of the environment.

diff --git a/inventory/host_vars/st01-mgmt-r01-u30/03_motd.yml b/inventory/host_vars/st01-mgmt-r01-u30/03_motd.yml
@@ -32,4 +32,4 @@ motd_content: |
     see /var/log/screen
 
   You can distribute OS Images using the folder /srv/www (make directory/file world readable).
-  You can download files from http://{{ mgmt_address_system }}:18080/.
+  You can download files from http://{{ mgmt_address_system }}:28080/.
diff --git a/inventory/host_vars/st01-mgmt-r01-u31/03_motd.yml b/inventory/host_vars/st01-mgmt-r01-u31/03_motd.yml
@@ -15,4 +15,4 @@ motd_content: |
                         |_|
 
   You can distribute OS Images using the folder /srv/www (make directory/file world readable).
-  You can download files from http://{{ mgmt_address_system }}:18080/.
+  You can download files from http://{{ mgmt_address_system }}:28080/.
diff --git a/misc/run_validations.sh b/misc/run_validations.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# TODOs:
+# - some validations are ignored, see https://github.com/osism/python-osism/pull/1054
+# - There is no "all" validations target
+
+LOGFILE="/var/log/validations-$(date --date="today" "+%Y-%m-%d_%H-%M-%S")"
+
+echo "Logging validations to $LOGFILE"
+(
+FAILED=""
+while read val; do 
+	echo "** VALIDATION: $val"; 
+	osism validate $val
+	if [ "$?" != "0" ];then
+		FAILED="$FAILED $val"
+		echo "VALIDATION FAILED"
+	fi
+done < <(osism validate 2>&1|grep barbican|tr '{,}' '\n\n\n'|grep -v -P "(mariadb-backup|mariadb-recovery|senlin-config)"|grep "[a-z]")
+
+echo "FAILED VALIDATIONS: ${FAILED:-none}"
+) 2>&1 |sudo tee $LOGFILE