openstack/charm-glance
Code Issues Proposed changes

Cleanup more hardcoded http values in templates

Browse Source
This commit is contained in:
James Page 2014-02-27 13:08:14 +00:00
parent b9b779c788
commit c3ff686822
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/essex/glance-api-paste.ini
View File

@ -44,7 +44,7 @@ service_port = {{ service_port }}
auth_host = {{ auth_host }}
auth_port = {{ auth_port }}
auth_protocol = {{ auth_protocol }}
auth_uri = http://{{ service_host }}:{{ service_port }}/
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}

2
templates/essex/glance-api.conf
View File

@ -50,7 +50,7 @@ qpid_tcp_nodelay = True
filesystem_store_datadir = /var/lib/glance/images/
swift_store_auth_version = 2
{% if swift_store %}
swift_store_auth_address = http://{{ service_host }}:{{ service_port }}/v2.0/
swift_store_auth_address = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/
swift_store_user = {{ admin_tenant_name }}:{{ admin_user }}
swift_store_key = {{ admin_password }}
swift_store_create_container_on_put = True

2
templates/essex/glance-registry-paste.ini
View File

@ -21,7 +21,7 @@ service_port = {{ service_port }}
auth_host = {{ auth_host }}
auth_port = {{ auth_port }}
auth_protocol = {{ auth_protocol }}
auth_uri = http://{{ service_host }}:{{ service_port }}/
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}

2
templates/folsom/glance-api-paste.ini
View File

@ -61,7 +61,7 @@ service_port = {{ service_port }}
auth_host = {{ auth_host }}
auth_port = {{ auth_port }}
auth_protocol = {{ auth_protocol }}
auth_uri = http://{{ service_host }}:{{ service_port }}/
auth_uri = {{ auth_protcol }}://{{ auth_host }}:{{ auth_port }}/
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}

2
templates/folsom/glance-api.conf
View File

@ -48,7 +48,7 @@ filesystem_store_datadir = /var/lib/glance/images/
{% if swift_store %}
swift_store_auth_version = 2
swift_store_auth_address = http://{{ service_host }}:{{ service_port }}/v2.0/
swift_store_auth_address = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/
swift_store_user = {{ admin_tenant_name }}:{{ admin_user }}
swift_store_key = {{ admin_password }}
swift_store_create_container_on_put = True

2
templates/folsom/glance-registry-paste.ini
View File

@ -21,7 +21,7 @@ service_port = {{ service_port }}
auth_host = {{ auth_host }}
auth_port = {{ auth_port }}
auth_protocol = {{ auth_protocol }}
auth_uri = http://{{ service_host }}:{{ service_port }}/
auth_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}

2
templates/grizzly/glance-api-paste.ini
View File

@ -61,7 +61,7 @@ service_port = {{ service_port }}
auth_host = {{ auth_host }}
auth_port = {{ auth_port }}
auth_protocol = {{ auth_protocol }}
auth_uri = http://{{ service_host }}:{{ service_port }}/
auth_uri = {{ auth_protcol }}://{{ auth_host }}:{{ auth_port }}/
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}

2
templates/grizzly/glance-registry-paste.ini
View File

@ -23,7 +23,7 @@ service_port = {{ service_port }}
auth_host = {{ auth_host }}
auth_port = {{ auth_port }}
auth_protocol = {{ auth_protocol }}
auth_uri = http://{{ service_host }}:{{ service_port }}/
auth_uri = {{ auth_protcol }}://{{ auth_host }}:{{ auth_port }}/
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}

2
templates/havana/glance-api-paste.ini
View File

@ -61,7 +61,7 @@ service_port = {{ service_port }}
auth_host = {{ auth_host }}
auth_port = {{ auth_port }}
auth_protocol = {{ auth_protocol }}
auth_uri = http://{{ service_host }}:{{ service_port }}/
auth_uri = {{ auth_protcol }}://{{ auth_host }}:{{ auth_port }}/
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}