Merge "Enable cinder-backup service"

roles/overcloud-deploy/README.md

@@ -12,7 +12,9 @@ Role Variables
 --------------
 
 A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-`overcloud_ipv6`: enables IPv6 deployment on the overcloud
+
+* `overcloud_ipv6`: enables IPv6 deployment on the overcloud
+* `enable_cinder_backup`: false/true - enables cinder-backup service.
 
 Dependencies
 ------------

roles/overcloud-deploy/defaults/main.yml

@@ -23,6 +23,9 @@ external_network_gateway: "{{ floating_ip_cidr|nthhost(1) }}"
 # Minutes to wait before giving up on the deploy.
 deploy_timeout: 90
 
+# Disable cinder backup by default
+enable_cinder_backup: false
+
 # Deployment variations
 extra_args: ""
 ssl_overcloud: false
@@ -59,6 +62,8 @@ set_overcloud_workers: true
 network_args: ""
 pacemaker_args: ""
 workers_args: ""
+backup_args: ""
+
 ssl_args: ""
 validation_args: "--validation-warnings-fatal"
 container_args: ""
@@ -71,6 +76,7 @@ deploy_args: >-
   {{ network_args }}
   {{ pacemaker_args }}
   {{ workers_args }}
+  {{ backup_args }}
   {{ ssl_args }}
   {{ extra_tht_config_args|default('') }}
   {{ validation_args }}

roles/overcloud-deploy/tasks/pre-deploy.yml

@@ -30,6 +30,12 @@
 - name: extract the number of controllers to be deployed
   set_fact: number_of_controllers="{{ deploy_args| regex_replace('^.*--control-scale +([0-9]+).*$', '\\1') | regex_replace('^[^ 0-9]*.*$', '1') }}"
 
+- name: Set cinder-backup
+  set_fact:
+    backup_args: >-
+      -e {{ overcloud_templates_path }}/environments/cinder-backup.yaml
+  when: enable_cinder_backup|bool
+
 - name: set ssl_args fact for master/newton
   set_fact:
     ssl_args: >-