From 0ed5a117ff4f1bc96bbc99bbdf30caf676075d1d Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 16 Sep 2014 01:32:53 -0500 Subject: [PATCH] fixed typo where fields were missing the 'volume_' prefix --- etc/rpc_deploy/rpc_user_config.yml | 4 ++-- etc/rpc_deploy/rpc_user_config.yml.example | 12 ++++++------ .../roles/cinder_backend_types/tasks/main.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etc/rpc_deploy/rpc_user_config.yml b/etc/rpc_deploy/rpc_user_config.yml index bf27e06c39..068717811b 100644 --- a/etc/rpc_deploy/rpc_user_config.yml +++ b/etc/rpc_deploy/rpc_user_config.yml @@ -145,8 +145,8 @@ storage_hosts: limit_container_types: cinder_volume lvm: volume_group: cinder-volumes - driver: cinder.volume.drivers.lvm.LVMISCSIDriver - backend_name: LVM_iSCSI + volume_driver: cinder.volume.drivers.lvm.LVMISCSIDriver + volume_backend_name: LVM_iSCSI # User defined Logging Hosts, this should be a required group log_hosts: diff --git a/etc/rpc_deploy/rpc_user_config.yml.example b/etc/rpc_deploy/rpc_user_config.yml.example index c0e3c54a5f..ef7e758c6f 100644 --- a/etc/rpc_deploy/rpc_user_config.yml.example +++ b/etc/rpc_deploy/rpc_user_config.yml.example @@ -165,8 +165,8 @@ storage_hosts: limit_container_types: cinder_volume lvm: volume_group: cinder-volumes - driver: cinder.volume.drivers.lvm.LVMISCSIDriver - backend_name: LVM_iSCSI + volume_driver: cinder.volume.drivers.lvm.LVMISCSIDriver + volume_backend_name: LVM_iSCSI cinder2: ip: 172.29.236.105 container_vars: @@ -174,8 +174,8 @@ storage_hosts: limit_container_types: cinder_volume lvm_ssd: volume_group: cinder-volumes - driver: cinder.volume.drivers.lvm.LVMISCSIDriver - backend_name: LVM_SSD_iSCSI + volume_driver: cinder.volume.drivers.lvm.LVMISCSIDriver + volume_backend_name: LVM_SSD_iSCSI cinder3: ip: 172.29.236.106 container_vars: @@ -188,8 +188,8 @@ storage_hosts: netapp_server_port: 80 netapp_login: "{{ cinder_netapp_username }}" netapp_password: "{{ cinder_netapp_password }}" - driver: cinder.volume.drivers.netapp.common.NetAppDriver - backend_name: NETAPP_iSCSI + volume_driver: cinder.volume.drivers.netapp.common.NetAppDriver + volume_backend_name: NETAPP_iSCSI # User defined Logging Hosts, this should be a required group log_hosts: diff --git a/rpc_deployment/roles/cinder_backend_types/tasks/main.yml b/rpc_deployment/roles/cinder_backend_types/tasks/main.yml index 9adc08f8ca..a4be345f20 100644 --- a/rpc_deployment/roles/cinder_backend_types/tasks/main.yml +++ b/rpc_deployment/roles/cinder_backend_types/tasks/main.yml @@ -24,6 +24,6 @@ shell: | . ~/openrc cinder type-create "{{ item.0 }}" - cinder type-key "{{ item.0 }}" set volume_backend_name="{{ cinder_backends[item.0]['backend_name'] }}" + cinder type-key "{{ item.0 }}" set volume_backend_name="{{ cinder_backends[item.0]['volume_backend_name'] }}" with_items: cinder_backends|dictsort when: cinder_backends is defined