openstack/openstack-ansible
Code Issues Proposed changes

Merge "Fix cinder-backup deployment issues"

Browse Source
This commit is contained in:
Jenkins 2015-04-28 15:37:26 +00:00 committed by Gerrit Code Review
commit 0e733ce6b5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/os_cinder/defaults/main.yml
View File

@ -87,7 +87,7 @@ cinder_keystone_auth_plugin: password
# * cinder_service_backup_swift_user # * cinder_service_backup_swift_user
# * cinder_service_backup_swift_key # * cinder_service_backup_swift_key
cinder_service_backup_program_enabled: false 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_driver: cinder.backup.drivers.swift
cinder_service_backup_swift_url: http://127.0.0.1:8080/v1/AUTH cinder_service_backup_swift_url: http://127.0.0.1:8080/v1/AUTH
cinder_service_backup_swift_user: admin cinder_service_backup_swift_user: admin

2
playbooks/roles/os_cinder/templates/cinder.conf.j2
View File

@ -19,7 +19,7 @@ auth_strategy = keystone
enable_v1_api = {{ cinder_enable_v1_api }} enable_v1_api = {{ cinder_enable_v1_api }}
enable_v2_api = {{ cinder_enable_v2_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_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 %} {% 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 ## Cinder Backup