From dcd9469411abad390c65657ebb7060d954f9eb25 Mon Sep 17 00:00:00 2001
From: Georgina Shippey <georgina.shippey@bbc.co.uk>
Date: Wed, 20 Mar 2019 10:16:56 +0000
Subject: [PATCH] Replace usage of netloc filters to urlsplit

Remove the references to netorigin and netloc_no_port as they will
be taken out from openstack-ansible-plugins

Now using ansible 2.4's urlsplit filter as a replacement.

Change-Id: I94302ced3e5d6faa4d8748590f323e89d9b7280c
Related-Bug: #1820830
---
 tasks/repo_build_prepare.yml | 4 ++--
 tasks/repo_build_wheels.yml  | 8 ++++----
 tests/test-repo-build.yml    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tasks/repo_build_prepare.yml b/tasks/repo_build_prepare.yml
index 5c28b93..adbda81 100644
--- a/tasks/repo_build_prepare.yml
+++ b/tasks/repo_build_prepare.yml
@@ -129,7 +129,7 @@
         virtualenv_site_packages: "no"
         extra_args: >-
           --index-url {{ repo_build_pip_default_index }}
-          --trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
+          --trusted-host {{ repo_build_pip_default_index | urlsplit('hostname') }}
           --constraint {{ repo_build_release_path }}/requirements_constraints.txt
           {{ pip_install_options | default('') }}
       register: install_packages
@@ -145,7 +145,7 @@
         virtualenv_site_packages: "no"
         extra_args: >-
           --index-url {{ repo_build_pip_default_index }}
-          --trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
+          --trusted-host {{ repo_build_pip_default_index | urlsplit('hostname') }}
           --constraint {{ repo_build_release_path }}/requirements_constraints.txt
           {{ pip_install_options | default('') }}
       register: install_packages
diff --git a/tasks/repo_build_wheels.yml b/tasks/repo_build_wheels.yml
index 1968459..b5e6997 100644
--- a/tasks/repo_build_wheels.yml
+++ b/tasks/repo_build_wheels.yml
@@ -47,10 +47,10 @@
     --no-binary :all:
     --constraint {{ repo_build_release_path }}/requirements_constraints.txt
     --index-url {{ repo_build_pip_default_index }}
-    --trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
+    --trusted-host {{ repo_build_pip_default_index | urlsplit('hostname') }}
     {% if repo_build_pip_extra_indexes is defined %}
     --extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }}
-    --trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }}
+    --trusted-host {{ repo_build_pip_extra_indexes | map(urlsplit('hostname')) | join(' --trusted-host ') }}
     {% endif %}
     --requirement {{ repo_build_release_path }}/requirements.txt
     {{ pip_install_options }}
@@ -72,10 +72,10 @@
     --no-binary {{ repo_build_pip_no_binary | join(' --no-binary ') }}
     {% endif %}
     --index-url {{ repo_build_pip_default_index }}
-    --trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
+    --trusted-host {{ repo_build_pip_default_index | urlsplit('hostname') }}
     {% if repo_build_pip_extra_indexes is defined %}
     --extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }}
-    --trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }}
+    --trusted-host {{ repo_build_pip_extra_indexes | map(urlsplit('hostname')) | join(' --trusted-host ') }}
     {% endif %}
     --build {{ repo_build_dir }}
     --requirement {{ repo_build_release_path }}/requirements.txt
diff --git a/tests/test-repo-build.yml b/tests/test-repo-build.yml
index 6fcdf2b..bda4b94 100644
--- a/tests/test-repo-build.yml
+++ b/tests/test-repo-build.yml
@@ -52,7 +52,7 @@
 
     - name: Set Ubuntu Cloud Archive repo URL based on discovered information
       set_fact:
-        uca_apt_repo_url: "{{ ubuntu_repo_url.stdout | netorigin }}/ubuntu-cloud-archive"
+        uca_apt_repo_url: "{{ ubuntu_repo_url.stdout | urlsplit('scheme') ~ '://' ~ urlsplit('netloc') }}/ubuntu-cloud-archive"
       when:
         - ansible_pkg_mgr == 'apt'
         - nodepool.stat.exists | bool