Merge "Stop relying on future mtime in tripleo_nova_image_cache"

tripleo_ansible/ansible_plugins/modules/tripleo_nova_image_cache.py

@@ -45,16 +45,6 @@ options:
       description:
          - ID of the image to cache
       required: true
-    ttl:
-      description:
-         - Ensure the image remains cached for at least ttl days
-      default: 7
-    state:
-      description:
-        - Whether the image be present in cache or expired
-          (nova should delete it later if it is no longer used)
-      choices: [present, expired]
-      default: present
     scp_source:
       description:
         - Attempt to scp the image from this nova-compute host
@@ -67,41 +57,23 @@ requirements: ["openstacksdk", "tripleo-common"]
 '''
 
 EXAMPLES = '''
-- name: Cache image for at least 2 weeks
+- name: Cache image
   tripleo_nova_image_cache:
     id: ec151bd1-aab4-413c-b577-ced089e7d3f8
-    ttl: 14
-
-- name: Allow nova to cleanup this image from cache
-  tripleo_nova_image_cache:
-    id: ec151bd1-aab4-413c-b577-ced089e7d3f8
-    state: expired
 
 - name: Cache image, try to copy from existing host
   tripleo_nova_image_cache:
     id: ec151bd1-aab4-413c-b577-ced089e7d3f8
-    ttl: 14
     scp_source: nova-compute-0
     scp_continue_on_error: true
 
 '''
 
 
-def ttl_to_ts(ttl_days):
-    """Return a timestamp at midnight UTC ttl_days in the future"""
-    epoch = datetime.datetime.utcfromtimestamp(0)
-    midnight_today = datetime.datetime.utcnow().replace(
-        hour=0, minute=0, second=0, microsecond=0)
-    expiry = midnight_today + datetime.timedelta(days=ttl_days+1)
-    return (expiry - epoch).total_seconds()
-
-
 def main():
 
     argument_spec = openstack_full_argument_spec(
         id=dict(required=True),
-        ttl=dict(default=7, type='int', min=1),
-        state=dict(default='present', choices=['expired', 'present']),
         _cache_dir=dict(required=True),
         _cache_file=dict(required=True),
         _chunk_size=dict(default=64 * 1024, type='int'),
@@ -118,8 +90,6 @@ def main():
     prefetched_path = module.params['_prefetched_path']
     scp_continue = module.params['scp_continue_on_error']
 
-    ttl_days = module.params['ttl']
-
     result = dict(
         changed=False,
         actions=[],
@@ -142,7 +112,6 @@ def main():
         if exists_in_glance:
             result['image'] = image.to_dict()
 
-        if module.params['state'] == 'present':
         if not exists_in_cache:
 
             if not exists_in_glance:
@@ -172,6 +141,7 @@ def main():
                     # until we can run within the container
                     os.chown(prefetched_path, 42436, 42436)
                     os.rename(prefetched_path, cache_file)
+                    result['changed'] = True
                 else:
                     result['actions'].append({
                         'name': 'Verify pre-fetched image',
@@ -234,42 +204,12 @@ def main():
                         except Exception:
                             pass
 
-            # Set the mtime in the future to prevent nova cleanup
+        # Always set the mtime to now but don't report this as a change
-            cache_file_stat = os.stat(cache_file)
+        # as this is constantly refreshed by nova (every 40mins by default)
-            expiry_ts = ttl_to_ts(ttl_days)
+        # while an instance on the host is using the image
         now = time.time()
-            if cache_file_stat.st_mtime != expiry_ts:
+        os.utime(cache_file, (now, now))
-                os.utime(cache_file, (now, expiry_ts))
+        result['mtime'] = now
-                result['actions'].append({
-                    'name': 'Update mtime',
-                    'from': cache_file_stat.st_mtime,
-                    'to': expiry_ts
-                })
-                result['changed'] = True
-
-        else:  # expired
-            if not exists_in_cache:
-                result['changed'] = False
-            else:
-                # Set the mtime to epoch to enable nova cleanup
-                now = time.time()
-                ts = 0
-                cache_file_stat = os.stat(cache_file)
-                if cache_file_stat.st_mtime > ts:
-                    os.utime(cache_file, (now, ts))
-                    result['actions'].append({
-                        'name': 'Update mtime',
-                        'from': cache_file_stat.st_mtime,
-                        'to': ts
-                    })
-                    result['changed'] = True
-
-                cache_file_stat = os.stat(cache_file)
-                result['mtime'] = cache_file_stat.st_mtime
-                result['expires'] = time.strftime(
-                    "%a, %d %b %Y %H:%M:%S %z",
-                    time.localtime(cache_file_stat.st_mtime)
-                )
 
         module.exit_json(**result)
 

tripleo_ansible/playbooks/tripleo_nova_image_cache.yml

@@ -42,9 +42,7 @@
 # test_args1.yml
 #   tripleo_nova_image_cache_images:
 #    - id: d23c6b8f-e166-4a02-afd8-0ae8d6f73f18
-#      state: expired
 #    - id: 81bbb16-d589-4730-be70-822a82ab6bb9
-#      ttl: 28
 #
 # Multi-stack inventory:
 #
@@ -53,9 +51,7 @@
 #   tripleo_nova_image_cache_plan: edge0
 #   tripleo_nova_image_cache_images:
 #    - id: d23c6b8f-e166-4a02-afd8-0ae8d6f73f18
-#      state: expired
 #    - id: 81bbb16-d589-4730-be70-822a82ab6bb9
-#      ttl: 28
 #   tripleo_nova_image_cache_use_proxy: true
 #   tripleo_nova_image_cache_proxy_hostname: compute-1 # optional, first nova_compute host is used otherwise
 #

tripleo_ansible/roles/tripleo_nova_image_cache/tasks/cache.yml

@@ -25,8 +25,6 @@
   become: true
   tripleo_nova_image_cache:
     id: "{{ image.id }}"
-    ttl: "{{ image.ttl|default(omit) }}"
-    state: "{{ image.state|default(omit) }}"
   any_errors_fatal: "{{ true if tripleo_nova_image_cache_use_proxy and tripleo_nova_image_cache_is_proxy_host else false }}"
   when:
     - not (tripleo_nova_image_cache_use_proxy | bool) or (tripleo_nova_image_cache_is_proxy_host | bool)
@@ -35,8 +33,6 @@
   become: true
   tripleo_nova_image_cache:
     id: "{{ image.id }}"
-    ttl: "{{ image.ttl|default(omit) }}"
-    state: "{{ image.state|default(omit) }}"
     scp_source: "{{ tripleo_nova_image_cache_proxy_source_ip }}"
     scp_continue_on_error: "{{ tripleo_nova_image_cache_ignore_proxy_error }}"
   when:

tripleo_ansible/roles/tripleo_nova_image_cache/tasks/main.yml

@@ -46,12 +46,5 @@
     image: "{{ item }}"
   loop: "{{ [
       tripleo_nova_image_cache_images|selectattr('state', 'undefined')|list,
-      tripleo_nova_image_cache_images|selectattr('state', 'defined')|rejectattr('state', 'equalto', 'expired')|list
+      tripleo_nova_image_cache_images|selectattr('state', 'defined')|selectattr('state', 'equalto', 'present')|list
     ]|flatten }}"
-
-
-- name: Uncache images
-  include_tasks: uncache.yml
-  vars:
-    image: "{{ item }}"
-  loop: "{{ tripleo_nova_image_cache_images|rejectattr('state', 'undefined')|selectattr('state', 'equalto', 'expired')|list }}"

tripleo_ansible/roles/tripleo_nova_image_cache/tasks/uncache.yml

@@ -1,21 +0,0 @@
----
-# Copyright 2019 Red Hat, Inc.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- name: "Uncache image {{ image.id }}"
-  become: true
-  tripleo_nova_image_cache:
-    id: "{{ image.id }}"
-    state: expired