openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Merge "Enable all services to use Keystone 'insecurely'"

Browse Source
This commit is contained in:
Jenkins 2015-07-10 16:53:24 +00:00 committed by Gerrit Code Review
commit b37b0e30c6
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/glance_service_setup.yml
View File

@ -22,6 +22,7 @@
service_name: "{{ glance_service_name }}" service_name: "{{ glance_service_name }}"
service_type: "{{ glance_service_type }}" service_type: "{{ glance_service_type }}"
description: "{{ glance_service_description }}" description: "{{ glance_service_description }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -40,6 +41,7 @@
user_name: "{{ glance_service_user_name }}" user_name: "{{ glance_service_user_name }}"
tenant_name: "{{ glance_service_project_name }}" tenant_name: "{{ glance_service_project_name }}"
password: "{{ glance_service_password }}" password: "{{ glance_service_password }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -58,6 +60,7 @@
user_name: "{{ glance_service_user_name }}" user_name: "{{ glance_service_user_name }}"
tenant_name: "{{ glance_service_project_name }}" tenant_name: "{{ glance_service_project_name }}"
role_name: "{{ glance_role_name }}" role_name: "{{ glance_role_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -79,6 +82,7 @@
publicurl: "{{ glance_service_publicurl }}" publicurl: "{{ glance_service_publicurl }}"
adminurl: "{{ glance_service_internalurl }}" adminurl: "{{ glance_service_internalurl }}"
internalurl: "{{ glance_service_adminurl }}" internalurl: "{{ glance_service_adminurl }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5

1
templates/glance-api.conf.j2
View File

@ -55,6 +55,7 @@ task_executor = {{ glance_task_executor }}
connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8
[keystone_authtoken] [keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ glance_keystone_auth_plugin }} auth_plugin = {{ glance_keystone_auth_plugin }}
signing_dir = {{ glance_system_user_home }}/cache/api signing_dir = {{ glance_system_user_home }}/cache/api
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}

1
templates/glance-registry.conf.j2
View File

@ -27,6 +27,7 @@ rabbit_password = {{ rabbitmq_password }}
connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8
[keystone_authtoken] [keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ glance_keystone_auth_plugin }} auth_plugin = {{ glance_keystone_auth_plugin }}
signing_dir = {{ glance_system_user_home }}/cache/registry/ signing_dir = {{ glance_system_user_home }}/cache/registry/
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}