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: Ib122b0290e699c6fed05b035af7cad056e4580ce

releasenotes/notes/package-list-name-changes-a86f7e7c805c2d81.yaml

@@ -0,0 +1,10 @@
+---
+upgrade:
+  - The variable ``neutron_apt_packages`` has been renamed to
+    ``neutron_distro_packages``.
+  - The variable ``neutron_lbaas_apt_packages`` has been renamed to
+    ``neutron_lbaas_distro_packages``.
+  - The variable ``neutron_vpnaas_apt_packages`` has been renamed to
+    ``neutron_vpnaas_distro_packages``.
+  - The variable ``neutron_apt_remove_packages`` has been renamed to
+    ``neutron_remove_distro_packages``.

tasks/neutron_install-apt.yml

@@ -49,7 +49,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_apt_packages }}"
+  with_items: "{{ neutron_distro_packages }}"
 
 - name: Install apt packages for LXB
   apt:
@@ -59,7 +59,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_lxb_apt_packages }}"
+  with_items: "{{ neutron_lxb_distro_packages }}"
   when:
     - neutron_services['neutron-linuxbridge-agent']['group'] in group_names
     - neutron_services['neutron-linuxbridge-agent'].service_en | bool
@@ -72,7 +72,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ ovs_apt_packages }}"
+  with_items: "{{ neutron_ovs_distro_packages }}"
   when:
     - neutron_services['neutron-openvswitch-agent']['group'] in group_names
     - neutron_services['neutron-openvswitch-agent'].service_en | bool
@@ -85,7 +85,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_lbaas_apt_packages }}"
+  with_items: "{{ neutron_lbaas_distro_packages }}"
   when:
     - neutron_services['neutron-lbaasv2-agent']['group'] in group_names
     - neutron_lbaasv2 | bool
@@ -98,7 +98,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_vpnaas_apt_packages }}"
+  with_items: "{{ neutron_vpnaas_distro_packages }}"
   when:
     - neutron_services['neutron-vpnaas-agent']['group'] in group_names
     - neutron_vpnaas | bool
@@ -111,4 +111,4 @@
   until: remove_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_apt_remove_packages }}"
+  with_items: "{{ neutron_remove_distro_packages }}"

tests/ovs_test_vars.yml

@@ -5,4 +5,4 @@ openstack_host_specific_kernel_modules:
     group: "physical_host"
 
 neutron_plugin_type: ml2.ovs
-neutron_local_ip: "{{ ansible_ssh_host }}"
+neutron_local_ip: "{{ ansible_ssh_host }}"

vars/ubuntu-14.04.yml

@@ -20,14 +20,14 @@ uca_openstack_release: mitaka
 uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
 uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
 
-ovs_apt_packages:
+neutron_ovs_distro_packages:
   - openvswitch-common
   - openvswitch-switch
 
 ## APT Cache options
 cache_timeout: 600
 
-neutron_apt_packages:
+neutron_distro_packages:
   - conntrack
   - dnsmasq-base
   - dnsmasq-utils
@@ -38,16 +38,16 @@ neutron_apt_packages:
   - libpq-dev
   - radvd
 
-neutron_lxb_apt_packages:
+neutron_lxb_distro_packages:
   - bridge-utils
 
-neutron_lbaas_apt_packages:
+neutron_lbaas_distro_packages:
   - haproxy
 
-neutron_vpnaas_apt_packages:
+neutron_vpnaas_distro_packages:
   - openswan
 
-neutron_apt_remove_packages:
+neutron_remove_distro_packages:
   - conntrackd
 
 neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"

vars/ubuntu-16.04.yml

@@ -18,14 +18,14 @@ uca_openstack_release: newton
 uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
 uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
 
-ovs_apt_packages:
+neutron_ovs_distro_packages:
   - openvswitch-common
   - openvswitch-switch
 
 ## APT Cache options
 cache_timeout: 600
 
-neutron_apt_packages:
+neutron_distro_packages:
   - conntrack
   - dnsmasq-base
   - dnsmasq-utils
@@ -36,16 +36,16 @@ neutron_apt_packages:
   - libpq-dev
   - radvd
 
-neutron_lxb_apt_packages:
+neutron_lxb_distro_packages:
   - bridge-utils
 
-neutron_lbaas_apt_packages:
+neutron_lbaas_distro_packages:
   - haproxy
 
-neutron_vpnaas_apt_packages:
+neutron_vpnaas_distro_packages:
   - openswan
 
-neutron_apt_remove_packages:
+neutron_remove_distro_packages:
   - conntrackd
 
 neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"