openstack/openstack-ansible
Code Issues Proposed changes

Merge "glance_api_servers must contain a valid url with protocol"

Browse Source
This commit is contained in:
Jenkins 2016-07-08 15:20:58 +00:00 committed by Gerrit Code Review
commit 58f262d73d
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
playbooks/inventory/group_vars/all.yml
View File

@ -120,7 +120,17 @@ cinder_rabbitmq_vhost: /cinder
## Glance
glance_service_port: 9292
glance_api_servers: "{{ internal_lb_vip_address }}:{{ glance_service_port }}"
glance_service_proto: http
glance_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(glance_service_proto) }}"
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 }}"
glance_service_user_name: glance
glance_rabbitmq_userid: glance
glance_rabbitmq_vhost: /glance

1
playbooks/inventory/group_vars/nova_all.yml
View File

@ -17,3 +17,4 @@ nova_external_ssl: "{{ openstack_external_ssl }}"
nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
nova_dhcp_domain: "{{ dhcp_domain }}"
nova_service_in_ldap: "{{ service_ldap_backend_enabled }}"
nova_glance_api_servers: "{{ glance_api_servers }}"