openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add VMware DataStore support to cinder"

Browse Source
This commit is contained in:
Jenkins 2017-07-17 08:57:49 +00:00 committed by Gerrit Code Review
commit 8c92888657
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -508,6 +508,7 @@ gnocchi_backend_storage: "{{ 'ceph' if enable_ceph|bool else 'file' }}"
# Cinder options # Cinder options
################################# #################################
cinder_backend_ceph: "{{ enable_ceph }}" cinder_backend_ceph: "{{ enable_ceph }}"
cinder_backend_vmwarevc_vmdk: "no"
cinder_volume_group: "cinder-volumes" cinder_volume_group: "cinder-volumes"
cinder_backup_driver: "nfs" cinder_backup_driver: "nfs"
cinder_backup_share: "" cinder_backup_share: ""
@ -619,3 +620,4 @@ ceph_cache_rule: "cache host firstn"
vmware_vcenter_host_ip: vmware_vcenter_host_ip:
vmware_vcenter_host_username: vmware_vcenter_host_username:
vmware_vcenter_host_password: vmware_vcenter_host_password:
vmware_vcenter_cluster_name:

2
ansible/roles/cinder/defaults/main.yml
View File

@ -134,6 +134,8 @@ cinder_backends:
enabled: "{{ enable_cinder_backend_hnas_iscsi | bool }}" enabled: "{{ enable_cinder_backend_hnas_iscsi | bool }}"
- name: "hnas-nfs" - name: "hnas-nfs"
enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}" enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}"
- name: "vmwarevc-vmdk"
enabled: "{{ cinder_backend_vmwarevc_vmdk | bool }}"
cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}" cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}"
cinder_iscsi_helper: "tgtadm" cinder_iscsi_helper: "tgtadm"

11
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -154,6 +154,17 @@ hnas_svc0_volume_type = {{ hnas_nfs_svc0_volume_type }}
hnas_svc0_hdp = {{ hnas_nfs_svc0_hdp }} hnas_svc0_hdp = {{ hnas_nfs_svc0_hdp }}
{% endif %} {% endif %}
{% if cinder_backend_vmwarevc_vmdk | bool %}
[vmwarevc-vmdk]
volume_backend_name=vmwarevc-vmdk
volume_driver = cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver
vmware_host_ip = {{ vmware_vcenter_host_ip }}
vmware_host_username = {{ vmware_vcenter_host_username }}
vmware_host_password = {{ vmware_vcenter_host_password }}
vmware_cluster_name = {{ vmware_vcenter_cluster_name }}
vmware_insecure = True
{% endif %}
[privsep_entrypoint] [privsep_entrypoint]
helper_command=sudo cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --config-file /etc/cinder/cinder.conf helper_command=sudo cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --config-file /etc/cinder/cinder.conf

2
etc/kolla/globals.yml
View File

@ -284,6 +284,7 @@ kolla_internal_vip_address: "10.10.10.254"
################################# #################################
# Enable / disable Cinder backends # Enable / disable Cinder backends
#cinder_backend_ceph: "{{ enable_ceph }}" #cinder_backend_ceph: "{{ enable_ceph }}"
#cinder_backend_vmwarevc_vmdk: "no"
#cinder_volume_group: "cinder-volumes" #cinder_volume_group: "cinder-volumes"
#cinder_backup_driver: "nfs" #cinder_backup_driver: "nfs"
#cinder_backup_share: "" #cinder_backup_share: ""
@ -368,3 +369,4 @@ tempest_floating_network_name:
#vmware_vcenter_host_password: #vmware_vcenter_host_password:
#vmware_datastore_name: #vmware_datastore_name:
#vmware_vcenter_name: #vmware_vcenter_name:
#vmware_vcenter_cluster_name: