Merge "Only update apt cache if necessary"

playbooks/roles/ceph_client/defaults/main.yml

@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+## APT Cache Options
+cache_timeout: 600
+
 # to user Ceph in OSA, you need to
 # - have the needed pools and a client user (for glance, cinder and/or nova)
 #   pre-provisioned in your ceph cluster; OSA assumes to have root access to

playbooks/roles/ceph_client/tasks/ceph_install.yml

@@ -13,12 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - ceph-apt-packages
+
+- name: Update apt if needed
+  apt:
+    update_cache: yes
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
+  tags:
+    - ceph-apt-packages
+
 - name: Install ceph packages
   apt:
     name: '{{ item.1 }}'
     state: latest
-    update_cache: yes
-    cache_valid_time: 600
   register: install_packages
   until: install_packages|success
   retries: 5

playbooks/roles/haproxy_server/defaults/main.yml

@@ -16,6 +16,9 @@
 # Defines that the role will be deployed on a host machine
 is_metal: true
 
+## APT Cache options
+cache_timeout: 600
+
 haproxy_apt_repo_url: "http://ppa.launchpad.net/vbernat/haproxy-1.5/ubuntu"
 haproxy_apt_repo:
   repo: "deb {{ haproxy_apt_repo_url }} {{ ansible_distribution_release }} main"

playbooks/roles/haproxy_server/tasks/haproxy_add_ppa_repo.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - haproxy-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - haproxy-apt-packages
 
@@ -87,3 +93,11 @@
   delay: 2
   tags:
     - haproxy-repos
+
+- name: Update apt if necessary
+  apt:
+    update_cache: yes
+  when: add_repos|changed
+  tags:
+    - haproxy-repos
+

playbooks/roles/haproxy_server/tasks/haproxy_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - haproxy-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - haproxy-apt-packages
 

playbooks/roles/os_aodh/defaults/main.yml

@@ -17,6 +17,9 @@
 debug: False
 verbose: False
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 aodh_venv_tag: untagged
 aodh_venv_bin: "/openstack/venvs/aodh-{{ aodh_venv_tag }}/bin"

playbooks/roles/os_aodh/tasks/aodh_install.yml

@@ -13,12 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - aodh-apt-packages
+
+- name: Update apt if needed
+  apt:
+    update_cache: yes
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
+  tags:
+    - aodh-apt-packages
+
 - name: Install apt packages
   apt:
     pkg: "{{ item }}"
     state: latest
-    update_cache: yes
-    cache_valid_time: 600
   register: install_packages
   until: install_packages|success
   retries: 5

playbooks/roles/os_ceilometer/defaults/main.yml

@@ -17,6 +17,9 @@
 debug: False
 verbose: True
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 ceilometer_venv_tag: untagged
 ceilometer_venv_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin"

playbooks/roles/os_ceilometer/tasks/ceilometer_install.yml

@@ -13,12 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - ceilometer-apt-packages
+
+- name: Update apt if needed
+  apt:
+    update_cache: yes
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
+  tags:
+    - ceilometer-apt-packages
+
 - name: Install apt packages
   apt:
     pkg: "{{ item }}"
     state: latest
-    update_cache: yes
-    cache_valid_time: 600
   register: install_packages
   until: install_packages|success
   retries: 5

playbooks/roles/os_cinder/defaults/main.yml

@@ -16,6 +16,9 @@
 # Defines that the role will be deployed on a host machine
 is_metal: true
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 cinder_venv_tag: untagged
 cinder_venv_bin: "/openstack/venvs/cinder-{{ cinder_venv_tag }}/bin"

playbooks/roles/os_cinder/tasks/cinder_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - cinder-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - cinder-apt-packages
 

playbooks/roles/os_glance/defaults/main.yml

@@ -17,6 +17,9 @@
 debug: False
 verbose: True
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 glance_venv_tag: untagged
 glance_venv_bin: "/openstack/venvs/glance-{{ glance_venv_tag }}/bin"

playbooks/roles/os_glance/tasks/glance_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - glance-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - glance-apt-packages
 

playbooks/roles/os_heat/defaults/main.yml

@@ -23,6 +23,9 @@ heat_ceilometer_enabled: False
 debug: False
 verbose: True
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 heat_venv_tag: untagged
 heat_venv_bin: "/openstack/venvs/heat-{{ heat_venv_tag }}/bin"

playbooks/roles/os_heat/tasks/heat_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - heat-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - heat-apt-packages
 

playbooks/roles/os_horizon/defaults/main.yml

@@ -17,6 +17,9 @@
 debug: False
 verbose: True
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 horizon_venv_tag: untagged
 horizon_venv_bin: "/openstack/venvs/horizon-{{ horizon_venv_tag }}/bin"

playbooks/roles/os_horizon/tasks/horizon_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - horizon-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - horizon-apt-packages
 

playbooks/roles/os_keystone/defaults/main.yml

@@ -17,6 +17,9 @@
 debug: False
 verbose: True
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 keystone_venv_tag: untagged
 keystone_venv_bin: "/openstack/venvs/keystone-{{ keystone_venv_tag }}/bin"

playbooks/roles/os_keystone/tasks/keystone_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - keystone-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - keystone-apt-packages
 

playbooks/roles/os_neutron/defaults/main.yml

@@ -20,6 +20,9 @@ is_metal: true
 debug: False
 verbose: True
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 neutron_venv_tag: untagged
 neutron_venv_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin"

playbooks/roles/os_neutron/tasks/neutron_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - neutron-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - neutron-apt-packages
 

playbooks/roles/os_nova/defaults/main.yml

@@ -20,6 +20,9 @@ nova_ceilometer_enabled: False
 debug: False
 verbose: True
 
+## APT Cache options
+cache_timeout: 600
+
 # Name of the virtual env to deploy into
 nova_venv_tag: untagged
 nova_venv_bin: "/openstack/venvs/nova-{{ nova_venv_tag }}/bin"

playbooks/roles/os_nova/tasks/nova_compute_kvm_install.yml

@@ -13,14 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - nova-apt-packages
+    - nova-compute-kvm-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - nova-apt-packages
     - nova-compute-kvm-apt-packages

playbooks/roles/os_nova/tasks/nova_console_novnc_install.yml

@@ -29,14 +29,20 @@
     - nova-install
     - nova-novnc-git
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - nova-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - nova-apt-packages
     - nova-novnc-apt-packages

playbooks/roles/os_nova/tasks/nova_console_spice_install.yml

@@ -13,14 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - nova-apt-packages
+    - nova-spice-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - nova-apt-packages
     - nova-spice-apt-packages

playbooks/roles/os_nova/tasks/nova_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - nova-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - nova-apt-packages
 

playbooks/roles/os_swift/defaults/main.yml

@@ -19,6 +19,7 @@ swift_ceilometer_enabled: False
 ## Verbosity Options
 debug: False
 verbose: True
+cache_timeout: 600
 
 # Name of the virtual env to deploy into
 swift_venv_tag: untagged

playbooks/roles/os_swift/tasks/swift_install.yml

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Update apt sources
+#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+#in 1.9.x or we move to 2.0 (if tested working)
+- name: Check apt last update file
+  stat:
+    path: /var/cache/apt
+  register: apt_cache_stat
+  tags:
+    - swift-apt-packages
+
+- name: Update apt if needed
   apt:
     update_cache: yes
-    cache_valid_time: 600
-  register: apt_update
-  until: apt_update|success
-  retries: 5
-  delay: 2
+  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
   tags:
     - swift-apt-packages