Rename package lists (and related vars) appropriately
In order to make it easier to differentiate between the lists of python packages, distribution packages, downloaded packages, package pins and other similar variables the variable names are being changed to ensure that they have a more explicit suffix that defines the purpose and makes the naming more consistent. This is to facilitate a lookup plugin which will be able to look up all the package lists and present them as a consolidated piece of data which may be used for artifact preparation. Change-Id: I6a27bfbd0fc9bbcd341d602bab074b0ea1bdbbca
This commit is contained in:
parent
9a784a376a
commit
f223f9b180
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
deprecations:
|
upgrade:
|
||||||
- The ``repo_apt_packages`` variable has been deprecated.
|
- The variable ``repo_server_packages`` that defines the list of packages
|
||||||
``repo_server_packages`` should be used instead to override
|
required to install a repo server has been replaced
|
||||||
packages required to install a repo server.
|
by ``repo_server_distro_packages``.
|
||||||
|
|
|
@ -38,6 +38,6 @@
|
||||||
until: install_packages|success
|
until: install_packages|success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 5
|
delay: 5
|
||||||
with_items: "{{ repo_server_packages | deprecated(repo_apt_packages, 'repo_apt_packages', 'repo_server_packages', 'Ocata') }}"
|
with_items: "{{ repo_server_distro_packages }}"
|
||||||
tags:
|
tags:
|
||||||
- repo-packages
|
- repo-packages
|
||||||
|
|
|
@ -21,6 +21,6 @@
|
||||||
until: install_packages|success
|
until: install_packages|success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 5
|
delay: 5
|
||||||
with_items: "{{ repo_server_packages }}"
|
with_items: "{{ repo_server_distro_packages }}"
|
||||||
tags:
|
tags:
|
||||||
- repo-packages
|
- repo-packages
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
until: install_packages|success
|
until: install_packages|success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 5
|
delay: 5
|
||||||
with_items: "{{ repo_pkg_cache_server_packages }}"
|
with_items: "{{ repo_pkg_cache_server_distro_packages }}"
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'yum'
|
- ansible_pkg_mgr == 'yum'
|
||||||
- repo_pkg_cache_enabled | bool
|
- repo_pkg_cache_enabled | bool
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
until: install_packages|success
|
until: install_packages|success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 5
|
delay: 5
|
||||||
with_items: "{{ repo_pkg_cache_server_packages }}"
|
with_items: "{{ repo_pkg_cache_server_distro_packages }}"
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
- repo_pkg_cache_enabled | bool
|
- repo_pkg_cache_enabled | bool
|
||||||
|
|
|
@ -18,11 +18,11 @@ repo_nginx_pid: /var/run/nginx.pid
|
||||||
git_daemon_path: /usr/lib/git-core/git-daemon
|
git_daemon_path: /usr/lib/git-core/git-daemon
|
||||||
rsyncd_service_name: rsync
|
rsyncd_service_name: rsync
|
||||||
|
|
||||||
repo_server_packages:
|
repo_server_distro_packages:
|
||||||
- git
|
- git
|
||||||
- lsyncd
|
- lsyncd
|
||||||
- nginx-extras
|
- nginx-extras
|
||||||
- rsync
|
- rsync
|
||||||
|
|
||||||
repo_pkg_cache_server_packages:
|
repo_pkg_cache_server_distro_packages:
|
||||||
- apt-cacher-ng
|
- apt-cacher-ng
|
||||||
|
|
|
@ -18,12 +18,12 @@ repo_nginx_pid: /run/nginx.pid
|
||||||
git_daemon_path: /usr/libexec/git-core/git-daemon
|
git_daemon_path: /usr/libexec/git-core/git-daemon
|
||||||
rsyncd_service_name: rsyncd
|
rsyncd_service_name: rsyncd
|
||||||
|
|
||||||
repo_server_packages:
|
repo_server_distro_packages:
|
||||||
- git-daemon
|
- git-daemon
|
||||||
- lsyncd
|
- lsyncd
|
||||||
- nginx
|
- nginx
|
||||||
- rsync
|
- rsync
|
||||||
|
|
||||||
repo_pkg_cache_server_packages:
|
repo_pkg_cache_server_distro_packages:
|
||||||
- apt-cacher-ng
|
- apt-cacher-ng
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue