openstack/openstack-ansible
Code Issues Proposed changes

Merge "Remove not needed glance variables"

Browse Source
This commit is contained in:
Zuul 2018-07-12 14:09:00 +00:00 committed by Gerrit Code Review
commit 4613c2d070
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inventory/group_vars/all/all.yml
View File

@ -74,8 +74,8 @@ openstack_external_ssl: true
## OpenStack global Endpoint Protos ## OpenStack global Endpoint Protos
openstack_service_publicuri_proto: https openstack_service_publicuri_proto: https
#openstack_service_adminuri_proto: http openstack_service_adminuri_proto: http
#openstack_service_internaluri_proto: http openstack_service_internaluri_proto: http
## Region Name ## Region Name
service_region: RegionOne service_region: RegionOne

15
inventory/group_vars/all/glance.yml
View File

@ -16,18 +16,9 @@
# This var is used by glance and ironic # This var is used by glance and ironic
glance_service_user_name: glance glance_service_user_name: glance
glance_service_port: 9292 glance_service_publicurl: "{{ openstack_service_publicuri_proto }}://{{ external_lb_vip_address }}:9292"
glance_service_proto: http glance_service_internalurl: "{{ openstack_service_internaluri_proto }}://{{ internal_lb_vip_address }}:9292"
glance_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(glance_service_proto) }}" glance_service_adminurl: "{{ openstack_service_adminuri_proto }}://{{ internal_lb_vip_address }}:9292"
glance_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(glance_service_proto) }}"
glance_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(glance_service_proto) }}"
glance_service_publicuri: "{{ glance_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ glance_service_port }}"
glance_service_publicurl: "{{ glance_service_publicuri }}"
glance_service_internaluri: "{{ glance_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
glance_service_internalurl: "{{ glance_service_internaluri }}"
glance_service_adminuri: "{{ glance_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
glance_service_adminurl: "{{ glance_service_adminuri }}"
glance_api_servers: "{{ glance_service_internaluri }}"
# When running RBD or horizon image upload mode is direct allow multiple locations. # When running RBD or horizon image upload mode is direct allow multiple locations.
# See https://bugs.launchpad.net/openstack-ansible/+bug/1730722 for more on the # See https://bugs.launchpad.net/openstack-ansible/+bug/1730722 for more on the

2
inventory/group_vars/cinder_all.yml
View File

@ -28,7 +28,6 @@ cinder_management_address: "{{ ansible_host }}"
# The address used for communications with the glance service # The address used for communications with the glance service
cinder_glance_host: "{{ internal_lb_vip_address }}" cinder_glance_host: "{{ internal_lb_vip_address }}"
cinder_glance_service_port: "{{ glance_service_port }}"
# If there are Swift hosts in the environment, then use it as the default Glance store # If there are Swift hosts in the environment, then use it as the default Glance store
# This is specifically duplicated from glance_all for the cinder_glance_api_version # This is specifically duplicated from glance_all for the cinder_glance_api_version
@ -38,7 +37,6 @@ glance_default_store: "{{ ((groups['swift_all'] is defined) and (groups['swift_a
# cinder_backend_lvm_inuse: True if current host has an lvm backend # cinder_backend_lvm_inuse: True if current host has an lvm backend
cinder_backend_lvm_inuse: '{{ (cinder_backends|default("")|to_json).find("cinder.volume.drivers.lvm.LVMVolumeDriver") != -1 }}' cinder_backend_lvm_inuse: '{{ (cinder_backends|default("")|to_json).find("cinder.volume.drivers.lvm.LVMVolumeDriver") != -1 }}'
cinder_service_in_ldap: "{{ service_ldap_backend_enabled }}" cinder_service_in_ldap: "{{ service_ldap_backend_enabled }}"
cinder_glance_api_servers: "{{ glance_api_servers }}"
# Ensure that the package state matches the global setting # Ensure that the package state matches the global setting
cinder_package_state: "{{ package_state }}" cinder_package_state: "{{ package_state }}"

1
inventory/group_vars/nova_all.yml
View File

@ -52,7 +52,6 @@ nova_external_ssl: "{{ openstack_external_ssl }}"
nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}' nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
nova_dhcp_domain: "{{ dhcp_domain }}" nova_dhcp_domain: "{{ dhcp_domain }}"
nova_service_in_ldap: "{{ service_ldap_backend_enabled }}" nova_service_in_ldap: "{{ service_ldap_backend_enabled }}"
nova_glance_api_servers: "{{ glance_api_servers }}"
# Ensure that the package state matches the global setting # Ensure that the package state matches the global setting
nova_package_state: "{{ package_state }}" nova_package_state: "{{ package_state }}"