Ensure package cache is updated appropriately

When the repo container is removed, the apt cache config is still in place and causes problems. This is due to the tasks running to remove the cache configuration not executing early enough in the deployment. This patch re-orders the tasks so that the removal can be done and the cache is updated afterwards to confirm a working state. It also makes the configuration happen on all hosts, then all containers, at the right timings to ensure that if the container is removed, the proxy config will also be removed automatically. Change-Id: I0d1bf9617594d9a5c7c2ea3335c80cc2478df985
2018-03-15 18:13:57 +00:00 · 2018-03-15 18:13:57 +00:00 · 1d731cdd89
commit 1d731cdd89
parent 882d98c94b
32 changed files with 25 additions and 58 deletions
--- a/playbooks/ceph-install.yml
+++ b/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:
--- a/playbooks/common-playbooks/cinder.yml
+++ b/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 %}
--- a/playbooks/common-playbooks/glance.yml
+++ b/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"

--- a/playbooks/common-playbooks/neutron.yml
+++ b/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 }}"
--- a/playbooks/common-playbooks/nova.yml
+++ b/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
--- a/playbooks/common-tasks/package-cache-proxy.yml
+++ b/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

--- a/playbooks/containers-lxc-create.yml
+++ b/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:
--- a/playbooks/containers-nspawn-create.yml
+++ b/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:
--- a/playbooks/etcd-install.yml
+++ b/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
--- a/playbooks/galera-install.yml
+++ b/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
--- a/playbooks/haproxy-install.yml
+++ b/playbooks/haproxy-install.yml
@ -71,8 +71,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
--- a/playbooks/memcached-install.yml
+++ b/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"
--- a/playbooks/openstack-hosts-setup.yml
+++ b/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:
--- a/playbooks/os-aodh-install.yml
+++ b/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"
--- a/playbooks/os-barbican-install.yml
+++ b/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"
--- a/playbooks/os-ceilometer-install.yml
+++ b/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"
--- a/playbooks/os-designate-install.yml
+++ b/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"
--- a/playbooks/os-gnocchi-install.yml
+++ b/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 }}"
--- a/playbooks/os-heat-install.yml
+++ b/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"
--- a/playbooks/os-horizon-install.yml
+++ b/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"
--- a/playbooks/os-ironic-install.yml
+++ b/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"
--- a/playbooks/os-keystone-install.yml
+++ b/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)
--- a/playbooks/os-octavia-install.yml
+++ b/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"
--- a/playbooks/os-sahara-install.yml
+++ b/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"
--- a/playbooks/os-swift-install.yml
+++ b/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
--- a/playbooks/os-tacker-install.yml
+++ b/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"
--- a/playbooks/os-trove-install.yml
+++ b/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"
--- a/playbooks/rabbitmq-install.yml
+++ b/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({}) }}"
--- a/playbooks/repo-use.yml
+++ b/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
--- a/playbooks/rsyslog-install.yml
+++ b/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:
--- a/playbooks/unbound-install.yml
+++ b/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:
--- a/playbooks/utility-install.yml
+++ b/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"