Merge branch 'improvement/2031-backup-nginx-ingress-ca' into q/2.4

scality · Nov 20, 2019 · 2679715 · 2679715
2 parents 7097469 + 3f610a5
commit 2679715
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/scripts/backup.sh b/scripts/backup.sh
@@ -165,6 +165,15 @@ backup_cas() {
     for ca in "${ca_files[@]}"; do
         _save_cp "${ca_dir}$ca" "${BACKUP_DIR}/pki/$ca"
     done
+
+    local -r metalk8s_ca_dir='/etc/metalk8s/pki/'
+    local -a metalk8s_ca_files=(
+        'nginx-ingress/ca.crt'
+        'nginx-ingress/ca.key'
+    )
+    for metalk8s_ca in "${metalk8s_ca_files[@]}"; do
+        _save_cp "${metalk8s_ca_dir}$metalk8s_ca" "${BACKUP_DIR}/pki_metalk8s/$metalk8s_ca"
+    done
 }
 
 backup_etcd() {

diff --git a/scripts/restore.sh.in b/scripts/restore.sh.in
@@ -134,6 +134,15 @@ restore_cas() {
     for ca in "${ca_files[@]}"; do
         _save_cp "${BACKUP_DIR}/pki/$ca" "${ca_dir}$ca"
     done
+
+    local -r metalk8s_ca_dir='/etc/metalk8s/pki/'
+    local -a metalk8s_ca_files=(
+        'nginx-ingress/ca.crt'
+        'nginx-ingress/ca.key'
+    )
+    for metalk8s_ca in "${metalk8s_ca_files[@]}"; do
+        _save_cp "${BACKUP_DIR}/pki_metalk8s/$metalk8s_ca" "${metalk8s_ca_dir}$metalk8s_ca"
+    done
 }
 
 configure_salt_master() {