Merge "Enable mistral_executor to perform backups"

deployment/mistral/mistral-executor-container-puppet.yaml

@@ -66,9 +66,25 @@ parameters:
     default: 'tripleo-admin'
     description: Name of user which manages the hosts
     type: string
+  MountBackupFilesystemPaths:
+    default: false
+    description: Set to True to mount all directories stated in BackupFilesystemPaths
+    type: boolean
+  BackupBaseMountpoint:
+    default: '/backup'
+    description: Absolute paths to directory, which will use as a base directory for all mounted directories marked for backup
+    type: string
+  BackupFilesystemPaths:
+    description: Absolute paths to directories, which should be included during filesystem backup on undercloud
+    type: json
+    default:
+      - /etc/hiera.yaml
+      - /etc/puppet/
+      - /var/lib/config-data/
 
 conditions:
   docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
+  mount_backup_filesystem: {equals : [{get_param: MountBackupFilesystemPaths}, true]}
 
 resources:
 
@@ -166,6 +182,25 @@ outputs:
                         '/home/tripleo-admin:/home/tripleo-admin'
                       params:
                         tripleo-admin: {get_param: TripleoAdminUser}
+                - if:
+                  - mount_backup_filesystem
+                  - repeat:
+                      for_each:
+                        PATH: {get_param: BackupFilesystemPaths}
+                      template:
+                        list_join:
+                        - ':'
+                        - - 'PATH'
+                          - list_join:
+                            - '/'
+                            - - {get_param: BackupBaseMountpoint}
+                              - 'PATH'
+                          - 'ro'
+                      expression: >
+                        ($.data.paths + $.data.extra_plugins)
+                        .flatten().distinct()
+
+                  - null
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             env_file: /etc/environment

extraconfig/post_deploy/undercloud_post.py

@@ -111,7 +111,9 @@ def _store_passwords_in_mistral_env(mistral):
         'undercloud_ceilometer_snmpd_password':
             CONF['snmp_readonly_user_password'],
         'undercloud_db_password':
-            CONF['undercloud_db_password']
+            CONF['undercloud_db_password'],
+        'undercloud_db_host':
+            CONF['undercloud_db_host']
     }
     try:
         mistral.environments.get(env_name).variables

extraconfig/post_deploy/undercloud_post.yaml

@@ -197,6 +197,7 @@ resources:
                 home_dir: {get_param: UndercloudHomeDir}
                 snmp_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
                 undercloud_db_password: {get_param: MysqlRootPassword}
+                undercloud_db_host: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
 
 
   UndercloudCtlplaneNetworkConfig: