diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-08-17 16:53:40 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-08-17 16:53:40 +0800 |
| commit | 3d6344d800aca694ef5f187149b0b9b7dd345d6d (patch) | |
| tree | cf18e0497b5eecc715d779cea02e3e2f2ec1f561 | |
| parent | 6ea99983fcaf13f90efff1c20a3aa20db0af92ba (diff) | |
| download | kolla-3d6344d800aca694ef5f187149b0b9b7dd345d6d.tar.gz kolla-3d6344d800aca694ef5f187149b0b9b7dd345d6d.zip | |
Move the keystone_*_url variable from common role to group vars
keystone_*_url are cross role variables. They are used in multi roles.
Move them from the common role to the group vars
TrivialFix
Change-Id: If451823ed7612bfec7bc797ec9dd2597164c6804
| -rw-r--r-- | ansible/group_vars/all.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/common/defaults/main.yml | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 671e8a197..97943fd14 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -274,6 +274,14 @@ kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem" 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 ####################### diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml index d2933dd27..81b457cf8 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -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_tag: "{{ openstack_release }}" 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" |