commit

terraform/control-plane1.bu

@@ -21,6 +21,9 @@ storage:
     - path: /etc/install-calico
       overwrite: true
       mode: 0755
+    - path: /var/lib/undercloud-stamps
+      mode: 0755
+
   files:
     - path: /etc/hostname
       mode: 0644
@@ -358,6 +361,8 @@ systemd:
         [Unit]
         Wants=kubeadm-init.service
         After=kubeadm-init.service
+        ConditionPathExists=!/var/lib/undercloud-stamps/install-calico.done
+
 
         [Service]
         StandardOutput=journal+console
@@ -406,6 +411,7 @@ systemd:
         #ExecStart=/bin/sh -c 'echo "port-forward -n calico-system service/whisker 8081:8081"'
         #ExecStart=/opt/bin/kubectl port-forward -n calico-system service/whisker 8081:8081
         
+        ExecStartPost=/usr/bin/touch /var/lib/undercloud-stamps/install-calico.done
         ExecStart=/usr/bin/systemctl disable install-calico.service
         #RemainAfterExit=true
         Restart=on-failure
@@ -418,6 +424,7 @@ systemd:
         [Unit]
         Wants=kubeadm-init.service
         After=kubeadm-init.service
+        ConditionPathExists=!/var/lib/undercloud-stamps/install-ceph.done
 
         [Service]
         StandardOutput=journal+console
@@ -451,6 +458,7 @@ systemd:
         
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/storage-class.yaml
         
+        ExecStartPost=/usr/bin/touch /var/lib/undercloud-stamps/install-ceph.done
         ExecStart=/usr/bin/systemctl disable install-ceph.service
         #RemainAfterExit=true
         Restart=on-failure
@@ -463,6 +471,8 @@ systemd:
         [Unit]
         Wants=install-ceph.service
         After=install-ceph.service
+        ConditionPathExists=!/var/lib/undercloud-stamps/install-gitea.done
+        
         [Service]
         StandardOutput=journal+console
         StandardError=journal+console
@@ -482,6 +492,7 @@ systemd:
         ExecStart=/bin/sleep 3m
         ExecStart=/opt/bin/kubectl exec deploy/gitea -n gitea -- /bin/startup.sh
 
+        ExecStartPost=/usr/bin/touch /var/lib/undercloud-stamps/install-gitea.done
         ExecStart=/usr/bin/systemctl disable install-gitea.service
         Restart=on-failure
         RestartSec=120s
@@ -493,6 +504,7 @@ systemd:
         [Unit]
         Wants=install-calico.service
         After=install-calico.service
+        ConditionPathExists=!/var/lib/undercloud-stamps/install-argocd.done
         [Service]
         StandardOutput=journal+console
         StandardError=journal+console
@@ -529,6 +541,7 @@ systemd:
         #ExecStart=/bin/sleep 10m
         #ExecStart=/opt/bin/kubectl apply -n argocd -f http://gitea.gitea.svc.k8aux.undercloud.cf:3000/undercloud/k8aux-apps/raw/branch/main/app-of-apps/app-of-apps.yaml
         
+        ExecStartPost=/usr/bin/touch /var/lib/undercloud-stamps/install-argocd.done
         ExecStart=/usr/bin/systemctl disable install-argocd.service
         Restart=on-failure
         RestartSec=120s
@@ -541,6 +554,8 @@ systemd:
         Description=Pin fixed dual-stack ClusterIPs for kube-dns, argocd-server and whisker
         After=install-argocd.service install-calico.service kubeadm-init.service network-online.target
         Wants=install-argocd.service install-calico.service kubeadm-init.service network-online.target
+        ConditionPathExists=!/var/lib/undercloud-stamps/pin-service-ips.done
+
 
         [Service]
         Type=oneshot
@@ -568,7 +583,7 @@ systemd:
           echo "[pin-service-ips] done." \
         '
 
-        ExecStart=/usr/bin/systemctl disable install-argocd.service
+        ExecStartPost=/usr/bin/touch /var/lib/undercloud-stamps/pin-service-ips.done
         Restart=on-failure
         RestartSec=120s
         [Install]