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: Id9a356f78162a77edc27209be215f04380a631dc
This commit is contained in:
parent
2cfee3530e
commit
075cb9edcd
@ -25,9 +25,8 @@ haproxy_interval: 12000
|
||||
## Haproxy standard API
|
||||
haproxy_repo: {}
|
||||
haproxy_gpg_keys: []
|
||||
haproxy_pre_packages: []
|
||||
haproxy_packages: []
|
||||
haproxy_pinned_packages: []
|
||||
haproxy_required_distro_packages: []
|
||||
haproxy_distro_packages: []
|
||||
|
||||
## Haproxy Stats
|
||||
haproxy_stats_enabled: False
|
||||
|
@ -0,0 +1,6 @@
|
||||
---
|
||||
upgrade:
|
||||
- The variable ``haproxy_pre_packages`` has been renamed to
|
||||
``haproxy_required_distro_packages``.
|
||||
- The variable ``haproxy_packages`` has been renamed to
|
||||
``haproxy_distro_packages``.
|
@ -40,7 +40,7 @@
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ haproxy_pre_packages }}"
|
||||
with_items: "{{ haproxy_required_distro_packages }}"
|
||||
tags:
|
||||
- haproxy-pre-apt-packages
|
||||
|
||||
|
@ -43,7 +43,7 @@
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ haproxy_packages }}"
|
||||
with_items: "{{ haproxy_distro_packages }}"
|
||||
tags:
|
||||
- haproxy-apt-packages
|
||||
|
||||
|
@ -21,6 +21,6 @@
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ haproxy_packages }}"
|
||||
with_items: "{{ haproxy_distro_packages }}"
|
||||
tags:
|
||||
- haproxy-yum-packages
|
||||
|
@ -1,2 +1,2 @@
|
||||
---
|
||||
external_lb_vip_address: 127.0.0.1
|
||||
external_lb_vip_address: 127.0.0.1
|
||||
|
@ -13,6 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
haproxy_packages:
|
||||
haproxy_distro_packages:
|
||||
- haproxy
|
||||
- rsyslog # Used for local logging
|
||||
|
@ -28,12 +28,12 @@ haproxy_gpg_keys:
|
||||
fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
|
||||
hash_id: '0xcffb779aadc995e4f350a060505d97a41c61b9cd'
|
||||
|
||||
haproxy_pre_packages:
|
||||
haproxy_required_distro_packages:
|
||||
- python-software-properties
|
||||
- software-properties-common
|
||||
- debconf-utils
|
||||
|
||||
haproxy_packages:
|
||||
haproxy_distro_packages:
|
||||
- haproxy
|
||||
- rsyslog # Used for local logging
|
||||
- vim-haproxy
|
||||
|
@ -16,12 +16,12 @@
|
||||
## APT Cache options
|
||||
cache_timeout: 600
|
||||
|
||||
haproxy_pre_packages:
|
||||
haproxy_required_distro_packages:
|
||||
- python-software-properties
|
||||
- software-properties-common
|
||||
- debconf-utils
|
||||
|
||||
haproxy_packages:
|
||||
haproxy_distro_packages:
|
||||
- haproxy
|
||||
- rsyslog # Used for local logging
|
||||
- vim-haproxy
|
||||
|
Loading…
Reference in New Issue
Block a user