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
This commit is contained in:
Jesse Pretorius 2017-03-29 12:34:57 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 41c982cb52
commit 793ae4d013
3 changed files with 2 additions and 8 deletions

View File

@ -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: <keyid>
# 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'

View File

@ -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

View File

@ -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