From 26a603fa8739dd83ff543d293fffea3ff3852fad Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 15 Apr 2016 16:13:02 -0500 Subject: [PATCH] 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 --- tasks/ironic_post_install.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks/ironic_post_install.yml b/tasks/ironic_post_install.yml index e63a3ec3..210bbaae 100644 --- a/tasks/ironic_post_install.yml +++ b/tasks/ironic_post_install.yml @@ -55,8 +55,8 @@ - name: Post swift tempURL secret key shell: | - . ~/openrc - {{ ironic_bin }}/swift \ + OS_ENDPOINT_TYPE=internalURL \ + {{ ironic_bin }}/swift {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} \ --os-username "service:{{ glance_service_user_name }}" \ --os-password {{ glance_service_password }} \ --os-auth-url {{ keystone_service_internalurl }} \ @@ -71,8 +71,8 @@ - name: Get swift account shell: | - . ~/openrc - {{ ironic_bin }}/swift \ + OS_ENDPOINT_TYPE=internalURL \ + {{ ironic_bin }}/swift {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} \ --os-username "service:{{ glance_service_user_name }}" \ --os-password {{ glance_service_password }} \ --os-auth-url {{ keystone_service_internalurl }} \