From 793ae4d01397bd91ebe18e9670e8e27d1ae91960 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 29 Mar 2017 12:34:57 +0100 Subject: [PATCH] Resolve user_external_repo deprecation warnings Warnings about 'user_external_repo_keys_list' and 'user_external_repos_list' being undefined are confusing. Closes-Bug: #1670021 Change-Id: I2fe78300dd04066515f4c5b175d56cc1a6628c9d --- defaults/main.yml | 2 ++ tasks/pre_install_apt.yml | 4 ---- tasks/pre_install_yum.yml | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 338ca59..0720d9f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -35,6 +35,7 @@ uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu" # This leverages apt_key module, and passes the id, keyserver, and url argument. # Therefore, you can ensure the id of the key you want to import with id: # or replace the source url with a keyserver. +user_external_repo_keys_list: [] # If you have defined another set of keys you want to include, the chances are # high you want to give also your own repository. @@ -49,6 +50,7 @@ uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu" # filename: "mymirror" # If your mirror includes UCA mirroring, you may then want to disable using uca # by setting in your user variables uca_enable: False +user_external_repos_list: [] # Set the package install state for distribution packages # Options are 'present' and 'latest' diff --git a/tasks/pre_install_apt.yml b/tasks/pre_install_apt.yml index a3e4f6e..d187a9b 100644 --- a/tasks/pre_install_apt.yml +++ b/tasks/pre_install_apt.yml @@ -54,8 +54,6 @@ retries: 5 delay: 2 with_items: "{{ user_external_repo_keys_list }}" - when: - - user_external_repo_keys_list is defined tags: - add-repo-keys @@ -70,7 +68,5 @@ retries: 5 delay: 2 with_items: "{{ user_external_repos_list }}" - when: - - user_external_repos_list is defined tags: - add-external-repo diff --git a/tasks/pre_install_yum.yml b/tasks/pre_install_yum.yml index 4adc617..5848df1 100644 --- a/tasks/pre_install_yum.yml +++ b/tasks/pre_install_yum.yml @@ -69,8 +69,6 @@ retries: 5 delay: 2 with_items: "{{ user_external_repo_keys_list }}" - when: - - user_external_repo_keys_list is defined tags: - add-repo-keys @@ -87,7 +85,5 @@ retries: 5 delay: 2 with_items: "{{ user_external_repos_list }}" - when: - - user_external_repos_list is defined tags: - add-external-repo