Changed the swift storage URL retrieval command

this change forces ironic to interact with the OpenStack InternalURL
instead of trying to use the public one. This is needed to ensure Ironic
isn't instructing it's nodes to retrieve user images from a public address
that they may not have access to.

Change-Id: Ibfeba53c2be802c51a3edc386e50fcbab8d0b01b
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-04-15 16:13:02 -05:00
parent 9b268e9ffc
commit 26a603fa87
No known key found for this signature in database
GPG Key ID: 69FEFFC5E2D9273F

View File

@ -55,8 +55,8 @@
- name: Post swift tempURL secret key - name: Post swift tempURL secret key
shell: | shell: |
. ~/openrc OS_ENDPOINT_TYPE=internalURL \
{{ ironic_bin }}/swift \ {{ ironic_bin }}/swift {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} \
--os-username "service:{{ glance_service_user_name }}" \ --os-username "service:{{ glance_service_user_name }}" \
--os-password {{ glance_service_password }} \ --os-password {{ glance_service_password }} \
--os-auth-url {{ keystone_service_internalurl }} \ --os-auth-url {{ keystone_service_internalurl }} \
@ -71,8 +71,8 @@
- name: Get swift account - name: Get swift account
shell: | shell: |
. ~/openrc OS_ENDPOINT_TYPE=internalURL \
{{ ironic_bin }}/swift \ {{ ironic_bin }}/swift {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} \
--os-username "service:{{ glance_service_user_name }}" \ --os-username "service:{{ glance_service_user_name }}" \
--os-password {{ glance_service_password }} \ --os-password {{ glance_service_password }} \
--os-auth-url {{ keystone_service_internalurl }} \ --os-auth-url {{ keystone_service_internalurl }} \