diff --git a/defaults/main.yml b/defaults/main.yml index a2e733f..686fdc8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/releasenotes/notes/package-list-name-changes-a26d94a44c24de2f.yaml b/releasenotes/notes/package-list-name-changes-a26d94a44c24de2f.yaml new file mode 100644 index 0000000..8a037c9 --- /dev/null +++ b/releasenotes/notes/package-list-name-changes-a26d94a44c24de2f.yaml @@ -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``. diff --git a/tasks/haproxy_add_ppa_repo.yml b/tasks/haproxy_add_ppa_repo.yml index 246f176..d966cb5 100644 --- a/tasks/haproxy_add_ppa_repo.yml +++ b/tasks/haproxy_add_ppa_repo.yml @@ -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 diff --git a/tasks/haproxy_install_apt.yml b/tasks/haproxy_install_apt.yml index 55b83fd..ea6e832 100644 --- a/tasks/haproxy_install_apt.yml +++ b/tasks/haproxy_install_apt.yml @@ -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 diff --git a/tasks/haproxy_install_yum.yml b/tasks/haproxy_install_yum.yml index 810fde8..367c6a4 100644 --- a/tasks/haproxy_install_yum.yml +++ b/tasks/haproxy_install_yum.yml @@ -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 diff --git a/tests/test-vars.yml b/tests/test-vars.yml index 00c2f20..0274176 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -1,2 +1,2 @@ --- -external_lb_vip_address: 127.0.0.1 \ No newline at end of file +external_lb_vip_address: 127.0.0.1 diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 30cff80..24ea442 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -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 diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml index 27cea2b..2df7d87 100644 --- a/vars/ubuntu-14.04.yml +++ b/vars/ubuntu-14.04.yml @@ -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 diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index ae85e07..cb76c9d 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -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