From 5cad16706a8361efe50b586590c96d949ef23cef Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 30 Aug 2016 19:04:17 +0100 Subject: [PATCH] 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: Ibf9dda810f366b03c393ea6106c89e6ec49c5ee1 --- tasks/pre-install.yml | 2 +- tests/ansible-role-requirements.yml | 2 +- vars/ubuntu-14.04.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/pre-install.yml b/tasks/pre-install.yml index fff81ed..82e672b 100644 --- a/tasks/pre-install.yml +++ b/tasks/pre-install.yml @@ -32,7 +32,7 @@ until: install_deps | success retries: 5 delay: 2 - with_items: "{{ apt_packages }}" + with_items: "{{ monasca_distro_packages }}" - name: Add a kafka user with temp sudo permissions # sudo removed in post-install.yml user: diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index d96f7bb..a6cfe61 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -30,4 +30,4 @@ - name: rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server scm: git - version: master \ No newline at end of file + version: master diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml index c7d47ae..6179365 100644 --- a/vars/ubuntu-14.04.yml +++ b/vars/ubuntu-14.04.yml @@ -18,7 +18,7 @@ # # Originally obtained from https://github.com/elastic/ansible-elasticsearch # -apt_packages: +monasca_distro_packages: - build-essential - chrony - git