From 78db69714b938caafa12febf8965a33df5689932 Mon Sep 17 00:00:00 2001 From: Georgina Shippey Date: Wed, 27 Mar 2019 17:31:32 +0000 Subject: [PATCH] Replace usage of netloc filters to urlsplit Removed the reference to netorigin as it will be taken out from openstack-ansible-plugins Now using ansible 2.4's urlsplit filter as a replacement. Change-Id: I4d8134e04d751e7506e21cd14424898c28200cb3 Related-Bug: #1820830 --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index ce8463df..b878a8fe 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -25,7 +25,7 @@ ironic_service_setup_host: "{{ openstack_service_setup_host | default('localhost ironic_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((ironic_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}" # Comma separated list of Glance API servers -ironic_glance_api_servers: "{{ (glance_service_internalurl | default('http://localhost')) | netorigin }}" +ironic_glance_api_servers: "{{ (glance_service_internalurl | default('http://localhost')) | urlsplit('scheme') ~ '://' ~ (glance_service_internalurl | default('http://localhost')) | urlsplit('netloc') }}" # Set the package install state for distribution and pip packages # Options are 'present' and 'latest'