diff --git a/tasks/glance_service_setup.yml b/tasks/glance_service_setup.yml index e0ed4f10..c7c10077 100644 --- a/tasks/glance_service_setup.yml +++ b/tasks/glance_service_setup.yml @@ -22,6 +22,7 @@ service_name: "{{ glance_service_name }}" service_type: "{{ glance_service_type }}" description: "{{ glance_service_description }}" + insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service until: add_service|success retries: 5 @@ -40,6 +41,7 @@ user_name: "{{ glance_service_user_name }}" tenant_name: "{{ glance_service_project_name }}" password: "{{ glance_service_password }}" + insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service until: add_service|success retries: 5 @@ -58,6 +60,7 @@ user_name: "{{ glance_service_user_name }}" tenant_name: "{{ glance_service_project_name }}" role_name: "{{ glance_role_name }}" + insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service until: add_service|success retries: 5 @@ -79,6 +82,7 @@ publicurl: "{{ glance_service_publicurl }}" adminurl: "{{ glance_service_internalurl }}" internalurl: "{{ glance_service_adminurl }}" + insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service until: add_service|success retries: 5 diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index 17bcf9d5..2dfa91a0 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -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 [keystone_authtoken] +insecure = {{ keystone_service_internaluri_insecure | bool }} auth_plugin = {{ glance_keystone_auth_plugin }} signing_dir = {{ glance_system_user_home }}/cache/api auth_url = {{ keystone_service_adminuri }} diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2 index 91420877..409be22a 100644 --- a/templates/glance-registry.conf.j2 +++ b/templates/glance-registry.conf.j2 @@ -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 [keystone_authtoken] +insecure = {{ keystone_service_internaluri_insecure | bool }} auth_plugin = {{ glance_keystone_auth_plugin }} signing_dir = {{ glance_system_user_home }}/cache/registry/ auth_url = {{ keystone_service_adminuri }}