Properly namespace cinder_storage_address

In the os_cinder role we have a "cinder_storage_address" variable which
is never set, this is meant to be the "storage_address" variable passed
to the role by the playbook.

The "storage_address" variable which is being used was not namespaced
and could cause issues with other storage services that have a similarly
named variable. Additionally, this ensures the "cinder_storage_address"
variable is not set to 127.0.0.1, which can cause confusion, as the
iscsi_ip_address setting is set to this value.

Secondly, we should utilise the appropriate "storage_address" variable
for cinder backends when we reference them in the sample configuration.
This PR adjusts that documentation, although using the original value
will still work as it did before.

Change-Id: I2b5f78f30d98e8bb49968e32f1b6bbc646014abd
This commit is contained in:
Andy McCrae 2016-09-12 09:49:26 +01:00
parent 3978647e7e
commit cbc92344bd
2 changed files with 2 additions and 1 deletions

View File

@ -572,7 +572,7 @@
# volume_backend_name: LVM_iSCSI
# volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver
# volume_group: cinder-volumes
# iscsi_ip_address: "{{ storage_address }}"
# iscsi_ip_address: "{{ cinder_storage_address }}"
# limit_container_types: cinder_volume
#
# Example:

View File

@ -139,6 +139,7 @@
cinder_venv_tag: "{{ openstack_release }}"
cinder_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/cinder-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
cinder_management_address: "{{ ansible_ssh_host }}"
cinder_storage_address: "{{ storage_address }}"
cinder_glance_host: "{{ internal_lb_vip_address }}"
cinder_glance_service_port: "{{ glance_service_port }}"
tags: