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: I9f20c6c53709202fe09f38ffe20f96e860ba188a
This commit is contained in:
Jesse Pretorius 2016-08-30 16:34:28 +01:00
parent 48f84ba36d
commit e87378f10c
8 changed files with 11 additions and 11 deletions

View File

@ -26,4 +26,4 @@ script:
- ansible-playbook tests/test.yml -i tests/inventory --syntax-check
notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
webhooks: https://galaxy.ansible.com/api/v1/notifications/

View File

@ -12,4 +12,4 @@
barbican_rabbitmq_password: SuperSecretePassword3
keystone_admin_user_name: admin
keystone_auth_admin_password: SuperSecretePassword4
keystone_admin_tenant_name: admin
keystone_admin_tenant_name: admin

View File

@ -26,4 +26,4 @@
- name: Restart barbican services
service:
name: "{{ barbican_uwsgi_program_name }}"
state: "restarted"
state: "restarted"

View File

@ -25,8 +25,8 @@
apt:
pkg: "{{ item }}"
state: "{{ barbican_package_state }}"
register: install_barbican_apt_packages
until: install_barbican_apt_packages |success
register: install_barbican_distro_packages
until: install_barbican_distro_packages |success
retries: 5
delay: 2
with_items: "{{ barbican_apt_packages }}"
with_items: "{{ barbican_distro_packages }}"

View File

@ -21,4 +21,4 @@
system_user: "{{ barbican_system_user_name }}"
system_group: "{{ barbican_system_group_name }}"
service_home: "{{ barbican_system_user_home }}"
log_directory: "{{ barbican_log_directory }}"
log_directory: "{{ barbican_log_directory }}"

View File

@ -24,4 +24,4 @@
name: "{{ program_name }}"
enabled: "yes"
notify:
- Restart barbican services
- Restart barbican services

View File

@ -42,4 +42,4 @@
- source: "barbican-vassals-api.ini.j2"
destination: "{{ barbican_etc_directory }}/vassals/barbican-api.ini"
config_overrides: "{{ barbican_vassals_api_overrides }}"
config_type: "ini"
config_type: "ini"

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
barbican_apt_packages:
barbican_distro_packages:
- apache2
- apache2-utils
- libapache2-mod-wsgi
@ -22,4 +22,4 @@ barbican_apt_packages:
- git
- libffi-dev
- gettext
- build-essential
- build-essential