Merge "Ensure package cache is updated appropriately"

playbooks/ceph-install.yml

@@ -29,7 +29,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
     #TODO: mgariepy, revisit to use include_role when https://github.com/ansible/ansible/issues/20077 is fixed
     - name: install the ceph stable repository key
       rpm_key:
@@ -133,7 +132,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
     #TODO: mgariepy, revisit to use include_role when https://github.com/ansible/ansible/issues/20077 is fixed
     - name: install the ceph stable repository key
       rpm_key:

playbooks/common-playbooks/cinder.yml

@@ -73,9 +73,6 @@
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
-    - name: Configure package proxy cache
-      include: ../common-tasks/package-cache-proxy.yml
-
     - name: Add volume group block device to cinder
       shell: |
         {% if item.value.volume_group is defined %}

playbooks/common-playbooks/glance.yml

@@ -60,9 +60,6 @@
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
-    - name: Configure package proxy cache
-      include: ../common-tasks/package-cache-proxy.yml
-
   roles:
     - role: "os_glance"
 

playbooks/common-playbooks/neutron.yml

@@ -68,9 +68,6 @@
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
-    - name: Configure package proxy cache
-      include: ../common-tasks/package-cache-proxy.yml
-
     - name: Create the neutron provider networks facts
       provider_networks:
         provider_networks: "{{ provider_networks }}"

playbooks/common-playbooks/nova.yml

@@ -79,9 +79,6 @@
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
-    - name: Configure package proxy cache
-      include: ../common-tasks/package-cache-proxy.yml
-
     - name: Add nbd devices to the compute
       shell: |
         for i in /dev/nbd*;do

playbooks/common-tasks/package-cache-proxy.yml

@@ -17,16 +17,17 @@
   uri:
     url: "{{ repo_pkg_cache_url }}/acng-report.html"
     method: "HEAD"
+    timeout: 3
   register: proxy_check
   failed_when: false
   tags:
     - common-proxy
 
-- name: Drop apt package manager proxy
+- name: Add apt package manager proxy
   copy:
     content: 'Acquire::http { Proxy "{{ repo_pkg_cache_url }}"; };'
     dest: "/etc/apt/apt.conf.d/00apt-cacher-proxy"
-  register: apt_proxy_dropped
+  register: _apt_proxy_added
   when:
     - repo_pkg_cache_enabled | bool
     - proxy_check.status == 200
@@ -34,24 +35,26 @@
   tags:
     - common-proxy
 
-- name: Update apt when proxy is added
+- name: Remove apt package manager proxy
+  file:
+    dest: "/etc/apt/apt.conf.d/00apt-cacher-proxy"
+    state: "absent"
+  register: _apt_proxy_removed
+  when:
+    - repo_pkg_cache_enabled | bool
+    - proxy_check.status != 200
+    - ansible_os_family == 'Debian'
+  tags:
+    - common-proxy
+
+- name: Update apt when proxy is added/removed
   apt:
     update_cache: yes
   retries: 5
   delay: 2
   when:
-    - apt_proxy_dropped | changed
-  tags:
-    - common-proxy
-
-- name: Remove apt package manager proxy
-  file:
-    dest: "/etc/apt/apt.conf.d/00apt-cacher-proxy"
-    state: "absent"
-  when:
-    - repo_pkg_cache_enabled | bool
-    - proxy_check.status != 200
-    - ansible_os_family == 'Debian'
+    - (_apt_proxy_added is mapping and _apt_proxy_added | changed) or
+      (_apt_proxy_removed is mapping and _apt_proxy_removed | changed)
   tags:
     - common-proxy
 

playbooks/containers-lxc-create.yml

@@ -57,6 +57,7 @@
   gather_facts: true
   user: root
   pre_tasks:
+    - include: common-tasks/package-cache-proxy.yml
     - include: common-tasks/set-upper-constraints.yml
     - include: common-tasks/set-pip-upstream-url.yml
   roles:

playbooks/containers-nspawn-create.yml

@@ -46,6 +46,7 @@
   gather_facts: true
   user: root
   pre_tasks:
+    - include: common-tasks/package-cache-proxy.yml
     - include: common-tasks/set-upper-constraints.yml
     - include: common-tasks/set-pip-upstream-url.yml
   roles:

playbooks/etcd-install.yml

@@ -23,7 +23,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "etcd"
       etcd_install_type: server

playbooks/galera-install.yml

@@ -33,7 +33,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
     - galera

playbooks/haproxy-install.yml

@@ -73,8 +73,6 @@
       rsyslog_client_config_name: "99-haproxy-rsyslog-client.conf"
       tags:
         - rsyslog
-  post_tasks:
-    - include: common-tasks/package-cache-proxy.yml
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
     - haproxy

playbooks/memcached-install.yml

@@ -28,7 +28,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "memcached_server"
     - role: "rsyslog_client"

playbooks/openstack-hosts-setup.yml

@@ -48,6 +48,8 @@
             (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or
             (ansible_os_family == 'Suse' and ansible_distribution_major_version == '42')
         msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), CentOS 7 (WIP) and openSUSE Leap 42.X (WIP)"
+
+    - include: common-tasks/package-cache-proxy.yml
     - include: common-tasks/set-upper-constraints.yml
     - include: common-tasks/set-pip-upstream-url.yml
   roles:

playbooks/os-aodh-install.yml

@@ -46,7 +46,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_aodh"
     - role: "openstack_openrc"

playbooks/os-barbican-install.yml

@@ -46,7 +46,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_barbican"
     - role: "openstack_openrc"

playbooks/os-ceilometer-install.yml

@@ -38,7 +38,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_ceilometer"
     - role: "openstack_openrc"

playbooks/os-designate-install.yml

@@ -62,7 +62,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_designate"
     - role: "openstack_openrc"

playbooks/os-gnocchi-install.yml

@@ -44,7 +44,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "ceph_client"
       openstack_service_system_user: "{{ gnocchi_system_user_name }}"

playbooks/os-heat-install.yml

@@ -59,7 +59,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_heat"
     - role: "rsyslog_client"

playbooks/os-horizon-install.yml

@@ -36,7 +36,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_horizon"
     - role: "rsyslog_client"

playbooks/os-ironic-install.yml

@@ -41,7 +41,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_ironic"
     - role: "openstack_openrc"

playbooks/os-keystone-install.yml

@@ -99,9 +99,6 @@
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
-    - name: Configure package proxy cache
-      include: common-tasks/package-cache-proxy.yml
-
     # todo(cloudnull): this task is being run only if/when keystone is installed on a physical host.
     #  This is not being run within a container because it is an unsupported action due to this
     #  issue: (https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1279041)

playbooks/os-octavia-install.yml

@@ -47,7 +47,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_octavia"
     - role: "openstack_openrc"

playbooks/os-sahara-install.yml

@@ -57,7 +57,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_sahara"
     - role: "openstack_openrc"

playbooks/os-swift-install.yml

@@ -35,7 +35,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
 
     # If we're using ceilometer then swift needs a rabbitmq/vhost & usera
     - include: common-tasks/rabbitmq-vhost-user.yml

playbooks/os-tacker-install.yml

@@ -42,7 +42,6 @@
         login_host: "{{ tacker_galera_address }}"
         db_name: "{{ tacker_galera_database }}"
       when: inventory_hostname == groups['tacker_all'][0]
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_tacker"
     - role: "openstack_openrc"

playbooks/os-trove-install.yml

@@ -62,7 +62,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_trove"
     - role: "openstack_openrc"

playbooks/rabbitmq-install.yml

@@ -28,7 +28,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "system_crontab_coordination"
   environment: "{{ deployment_environment_variables | default({}) }}"

playbooks/repo-use.yml

@@ -17,12 +17,12 @@
 # is done upfront. This would mean that the openstack_hosts role
 # can run once and for all directly after the
 # lxc-container-create playbook.
-
-- name: Configure all nodes to use repo
+- name: Configure all nodes to use the repo container for python/apt packages
   hosts: all:!repo_all
+  pre_tasks:
+    - include: common-tasks/package-cache-proxy.yml
   roles:
     - pip_install
-
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
     - always

playbooks/rsyslog-install.yml

@@ -29,7 +29,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "rsyslog_server"
       tags:

playbooks/unbound-install.yml

@@ -21,7 +21,6 @@
   pre_tasks:
     - include: common-tasks/os-log-dir-setup.yml
     - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-    - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "unbound"
       tags:

playbooks/utility-install.yml

@@ -30,8 +30,6 @@
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
-    - include: common-tasks/package-cache-proxy.yml
-
     - name: Create log directory (not is_metal)
       file:
         dest: "/var/log/utility"