update

Signed-off-by: Marc Schöchlin <[email protected]>
SovereignCloudStack · Sep 13, 2024 · 0c958ca · 0c958ca
1 parent 3843c8b
commit 0c958ca
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 58 deletions.
diff --git a/documentation/System_Deployment.md b/documentation/System_Deployment.md
@@ -28,13 +28,15 @@
    * Align configuration
      (replace external with internal ip address in `ansible_host`)
      ```
-     vim -d environments/manager/host_vars/st01-mgmt-r01-u30.yml ./inventory/host_vars/st01-mgmt-r01-u30.yml
+     vim -d environments/manager/host_vars/st01-mgmt-r01-u30.yml ./inventory/host_vars/st01-mgmt-r01-u30/01_base.yml
      ```
    * Run Ansible on manager
      ```
      ssh st01-mgmt-r01-u30
      sudo -u dragon -i
      osism apply configuration
+     osism reconciler sync
+     osism apply facts
      ```
 3. Install Manager Infrastructure from manager
    ```
@@ -116,19 +118,20 @@ Please just add issues to this project with hints or directly [contact me](https
   ```
 * Install the installation infrastructure
   ```
-  osism apply scs_infra -l 'all:!manager'
+  osism apply scs_infra 
   ```
 * Execute the [bootstrap procedure](https://osism.tech/de/docs/guides/deploy-guide/bootstrap)
 * Run Basic customizations
   ```
   osism apply scs_all_nodes -l 'all:!manager'
   ```
 * Check if the ntp time setup is correct
+  (checks pre installation conditions like proper time sync and network connectivity)
   ```
-  osism apply scs_check_ntp
+  osism apply scs_check_preinstall
   ```
 
-## Deploy the infratructure servcies
+## Deploy the infratructure services
 
 Deployment order
 

diff --git a/...s/custom/playbook-scs_check_landscape.yml → ...custom/playbook-scs_check_postinstall.yml b/...s/custom/playbook-scs_check_landscape.yml → ...custom/playbook-scs_check_postinstall.yml
@@ -1,5 +1,5 @@
 ---
-- name: Check the state of all nodes
+- name: Check the state of all nodes after installation
   hosts: generic
   gather_facts: no
   become: yes
@@ -8,5 +8,5 @@
       ansible.builtin.command: /usr/local/scripts/scs_check_chrony.sh 2 0.01
     - name: Check network connectivity - /usr/local/scripts/scs_check_network_connectivity.sh
       ansible.builtin.command: /usr/local/scripts/scs_check_network_connectivity.sh
-    - name: Check servcices - /usr/local/scripts/scs_check_services.sh
+    - name: Check services - /usr/local/scripts/scs_check_services.sh
       ansible.builtin.command: /usr/local/scripts/scs_check_services.sh
diff --git a/environments/custom/playbook-scs_check_preinstall.yml b/environments/custom/playbook-scs_check_preinstall.yml
@@ -0,0 +1,10 @@
+---
+- name: Check the state of all nodes before installation
+  hosts: generic
+  gather_facts: no
+  become: yes
+  tasks:
+    - name: Check all ntp datasources - /usr/local/scripts/scs_check_chrony.sh
+      ansible.builtin.command: /usr/local/scripts/scs_check_chrony.sh 2 0.01
+    - name: Check network connectivity - /usr/local/scripts/scs_check_network_connectivity.sh
+      ansible.builtin.command: /usr/local/scripts/scs_check_network_connectivity.sh
diff --git a/inventory/10-custom b/inventory/10-custom
@@ -6,55 +6,55 @@
 
 [manager_infra]
 st01-mgmt-r01-u30
-#st01-mgmt-r01-u31
+st01-mgmt-r01-u31
+
+[network_switches]
+st01-sw100g-r01-u36
+st01-sw100g-r01-u37
+st01-sw100g-r01-u41
+st01-sw10g-r01-u38
+st01-sw10g-r01-u39
+st01-sw1g-r01-u32
+st01-sw1g-r01-u33
+st01-sw1g-r01-u42
+st01-sw1g-r01-u47
+st01-sw25g-r01-u34
+st01-sw25g-r01-u35
+st01-sw25g-r01-u40
+
+[dhcp_static_nodes]
+st01-sw100g-r01-u36
+st01-sw100g-r01-u37
+st01-sw100g-r01-u41
+st01-sw10g-r01-u38
+st01-sw10g-r01-u39
+st01-sw1g-r01-u32
+st01-sw1g-r01-u33
+st01-sw1g-r01-u42
+st01-sw1g-r01-u47
+st01-sw25g-r01-u34
+st01-sw25g-r01-u35
+st01-sw25g-r01-u40
+st01-comp-r01-u09
+st01-comp-r01-u11
+st01-comp-r01-u13
+st01-comp-r01-u15
+st01-comp-r01-u17
+st01-comp-r01-u19
+st01-comp-r01-u21
+st01-comp-r01-u22
+st01-comp-r01-u23
+st01-comp-r01-u24
+st01-comp-r01-u25
+st01-comp-r01-u26
+st01-ctl-r01-u27
+st01-ctl-r01-u28
+st01-ctl-r01-u29
+st01-mgmt-r01-u30
+st01-mgmt-r01-u31
+st01-stor-r01-u01
+st01-stor-r01-u03
+st01-stor-r01-u05
+st01-stor-r01-u07
+
 
-#[network_switches]
-#st01-sw100g-r01-u36
-#st01-sw100g-r01-u37
-#st01-sw100g-r01-u41
-#st01-sw10g-r01-u38
-#st01-sw10g-r01-u39
-#st01-sw1g-r01-u32
-#st01-sw1g-r01-u33
-#st01-sw1g-r01-u42
-#st01-sw1g-r01-u47
-#st01-sw25g-r01-u34
-#st01-sw25g-r01-u35
-#st01-sw25g-r01-u40
-#
-#[dhcp_static_nodes]
-#st01-sw100g-r01-u36
-#st01-sw100g-r01-u37
-#st01-sw100g-r01-u41
-#st01-sw10g-r01-u38
-#st01-sw10g-r01-u39
-#st01-sw1g-r01-u32
-#st01-sw1g-r01-u33
-#st01-sw1g-r01-u42
-#st01-sw1g-r01-u47
-#st01-sw25g-r01-u34
-#st01-sw25g-r01-u35
-#st01-sw25g-r01-u40
-#st01-comp-r01-u09
-#st01-comp-r01-u11
-#st01-comp-r01-u13
-#st01-comp-r01-u15
-#st01-comp-r01-u17
-#st01-comp-r01-u19
-#st01-comp-r01-u21
-#st01-comp-r01-u22
-#st01-comp-r01-u23
-#st01-comp-r01-u24
-#st01-comp-r01-u25
-#st01-comp-r01-u26
-#st01-ctl-r01-u27
-#st01-ctl-r01-u28
-#st01-ctl-r01-u29
-#st01-mgmt-r01-u30
-#st01-mgmt-r01-u31
-#st01-stor-r01-u01
-#st01-stor-r01-u03
-#st01-stor-r01-u05
-#st01-stor-r01-u07
-#
-#
diff --git a/inventory/20-roles b/inventory/20-roles
@@ -31,7 +31,7 @@ st01-ctl-r01-u27
 st01-ctl-r01-u28
 st01-ctl-r01-u29
 st01-mgmt-r01-u30
-#st01-mgmt-r01-u31
+st01-mgmt-r01-u31
 st01-stor-r01-u01
 st01-stor-r01-u03
 st01-stor-r01-u05