diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-18 03:14:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-18 03:14:37 +0000 |
| commit | c44edb3659e9148a70887ed9567ce2a73b928882 (patch) | |
| tree | 4fce5d74d5c22c7f6a1dbbbef79ae75e056eef73 | |
| parent | f93d0012202eea77f69ca34b7086436f0139b36d (diff) | |
| parent | 3d6344d800aca694ef5f187149b0b9b7dd345d6d (diff) | |
| download | kolla-c44edb3659e9148a70887ed9567ce2a73b928882.tar.gz kolla-c44edb3659e9148a70887ed9567ce2a73b928882.zip | |
Merge "Move the keystone_*_url variable from common role to group vars"
| -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" |