From 28e23043f9853694a5cb235f2ba0757268074ccf Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Tue, 28 Apr 2015 11:50:29 +0100 Subject: [PATCH] Fix cinder-backup deployment issues Currently, cinder-backup isn't getting deployed correctly. This commit fixes two of the known issues so that we correctly update cinder.conf on the cinder_volume hosts and also update the cinder_service_backup_program_name so we correctly deploy the init script for cinder-backup. Partial-bug: #1399386 Change-Id: I18551197d5f3e6349a22e13f989b4c38ad6030af --- playbooks/roles/os_cinder/defaults/main.yml | 2 +- playbooks/roles/os_cinder/templates/cinder.conf.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/os_cinder/defaults/main.yml b/playbooks/roles/os_cinder/defaults/main.yml index 9904c6bbb7..5da26917f4 100644 --- a/playbooks/roles/os_cinder/defaults/main.yml +++ b/playbooks/roles/os_cinder/defaults/main.yml @@ -87,7 +87,7 @@ cinder_keystone_auth_plugin: password # * cinder_service_backup_swift_user # * cinder_service_backup_swift_key cinder_service_backup_program_enabled: false -cinder_service_backup_program_name: cinder-volume +cinder_service_backup_program_name: cinder-backup cinder_service_backup_driver: cinder.backup.drivers.swift cinder_service_backup_swift_url: http://127.0.0.1:8080/v1/AUTH cinder_service_backup_swift_user: admin diff --git a/playbooks/roles/os_cinder/templates/cinder.conf.j2 b/playbooks/roles/os_cinder/templates/cinder.conf.j2 index db20420ea3..1dd900e90e 100644 --- a/playbooks/roles/os_cinder/templates/cinder.conf.j2 +++ b/playbooks/roles/os_cinder/templates/cinder.conf.j2 @@ -19,7 +19,7 @@ auth_strategy = keystone enable_v1_api = {{ cinder_enable_v1_api }} enable_v2_api = {{ cinder_enable_v2_api }} -{% if inventory_hostname not in groups['cinder_volume'] %} +{% if inventory_hostname in groups['cinder_volume'] %} {% if cinder_service_backup_program_enabled == true %} {% if cinder_service_backup_swift_url is defined and cinder_service_backup_swift_user is defined and cinder_service_backup_swift_key is defined %} ## Cinder Backup