openstack/kolla
Code Issues Proposed changes

Merge "Move the keystone_*_url variable from common role to group vars"

Browse Source
This commit is contained in:
Jenkins 2016-08-18 03:14:37 +00:00 committed by Gerrit Code Review
commit c44edb3659
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/group_vars/all.yml
View File

@ -274,6 +274,14 @@ kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
kibana_user: "kibana" kibana_user: "kibana"
####################
# Keystone Options
####################
keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3"
keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3"
keystone_public_url: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}/v3"
####################### #######################
# Glance options # Glance options
####################### #######################

7
ansible/roles/common/defaults/main.yml
View File

@ -17,10 +17,3 @@ heka_image_full: "{{ heka_image }}:{{ heka_tag }}"
cron_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-cron" cron_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-cron"
cron_tag: "{{ openstack_release }}" cron_tag: "{{ openstack_release }}"
cron_image_full: "{{ cron_image }}:{{ cron_tag }}" cron_image_full: "{{ cron_image }}:{{ cron_tag }}"
####################
# OpenStack
####################
keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3"
keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3"
keystone_public_url: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}/v3"