Merge "Move the snapshots feature to optional/beta" into stable/train

tripleo_ansible/roles/backup-and-restore/backup/tasks/db_backup.yml

@@ -53,6 +53,7 @@
   when:
     - enabled_galera
     - tripleo_backup_and_restore_service_manager|bool
+    - not tripleo_backup_and_restore_enable_snapshots|bool
   run_once: true
   tags:
     - bar_create_recover_image
@@ -60,7 +61,7 @@
 - name: Wait until pacemaker has Galera up&running
   shell: |
     set -o pipefail
-    netstat -tunlp | grep ":3306 " | sed -e 's/.*\///'
+    ss -tunlp | grep ":3306 " | sed -e 's/.*\///'
   register: mysql_result
   retries: 300
   until: mysql_result is search('mysqld')
@@ -68,6 +69,7 @@
   when:
     - enabled_galera
     - tripleo_backup_and_restore_service_manager|bool
+    - not tripleo_backup_and_restore_enable_snapshots|bool
   tags:
     - bar_create_recover_image
 
@@ -132,6 +134,7 @@
     - tripleo_backup_and_restore_mysql_container == "mysql"
     - not enabled_galera
     - tripleo_backup_and_restore_service_manager|bool
+    - not tripleo_backup_and_restore_enable_snapshots|bool
   tags:
     - bar_create_recover_image
 
@@ -140,6 +143,7 @@
   when:
     - enabled_galera
     - tripleo_backup_and_restore_service_manager|bool
+    - not tripleo_backup_and_restore_enable_snapshots|bool
   run_once: true
   tags:
     - bar_create_recover_image

tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml

@@ -32,6 +32,14 @@
   tags:
     - always
 
+- name: Take this node out of pacemaker
+  command: pcs node standby
+  when:
+    - pacemaker_enabled
+    - tripleo_backup_and_restore_enable_snapshots|bool
+  tags:
+    - bar_create_recover_image
+
 - name: Create the node backup
   become: true
   command: rear {{ '-s ' if tripleo_backup_and_restore_rear_simulate else '' }}-d -v mkbackup

tripleo_ansible/roles/backup-and-restore/backup/tasks/pacemaker_unstandby.yml

@@ -0,0 +1,32 @@
+---
+# Copyright 2019 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# Start again pacemaker
+- name: Add the node to the pacemaker cluster
+  command: pcs node unstandby
+  tags:
+    - bar_create_recover_image
+
+- name: Wait until pacemaker has Galera up&running
+  shell: |
+    set -o pipefail
+    ss -tunlp | grep ":3306 " | sed -e 's/.*\///'
+  register: mysql_result
+  retries: 300
+  until: mysql_result is search('mysqld')
+  delay: 5
+  tags:
+    - bar_create_recover_image

tripleo_ansible/roles/backup-and-restore/defaults/main.yml

@@ -31,6 +31,10 @@ tripleo_backup_and_restore_mysql_backup_file: "openstack-backup-mysql.sql"
 # Default name for the Undercloud mysql DB grants file
 tripleo_backup_and_restore_mysql_grants_file: "openstack-backup-mysql-grants.sql"
 
+# If this is false, backup of the overcloud is taken by stopping it completely. Enable it to do a
+# backup stopping only one node at a time, maintaining the controller active during the backup duration.
+tripleo_backup_and_restore_enable_snapshots: true
+
 # All variables within this role should have a prefix of "tripleo_backup_and_restore"
 tripleo_backup_and_restore_debug: false
 # By default this should be the Undercloud node

tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml

@@ -23,5 +23,4 @@
       tripleo_backup_and_restore_nfs_server: localhost
       tripleo_container_cli: podman
       tripleo_backup_and_restore_rear_simulate: true
-      tripleo_backup_and_restore_service_manager: false
       tripleo_backup_and_restore_hiera_config_file: "{{ ansible_user_dir }}/hiera.yaml"

tripleo_ansible/roles/backup-and-restore/tasks/main.yml

@@ -42,6 +42,7 @@
   import_tasks: ../backup/tasks/service_manager_pause.yml
   when:
     - tripleo_backup_and_restore_service_manager
+    - not tripleo_backup_and_restore_enable_snapshots|bool
 
 - name: Backup the database
   import_tasks: ../backup/tasks/db_backup.yml
@@ -57,4 +58,11 @@
     - name: Service management
       import_tasks: ../backup/tasks/service_manager_unpause.yml
       when:
-        - tripleo_backup_and_restore_service_manager
+        - tripleo_backup_and_restore_service_manager|bool
+        - not tripleo_backup_and_restore_enable_snapshots|bool
+
+    - name: Pacemaker management
+      import_tasks: ../backup/tasks/pacemaker_unstandby.yml
+      when:
+        - pacemaker_enabled
+        - tripleo_backup_and_restore_enable_snapshots|bool