From ee67e26b4a2bba7598fc6cf796e8b08c8407221c Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 2 Apr 2020 10:19:09 -0500 Subject: [PATCH] Remove ansible-cron role Once the previous patch has landed and run on system-config then we can remove the role altogether. Change-Id: I14fef0e178544d71390a6601915c745647435ab9 --- .zuul.yaml | 1 - playbooks/roles/ansible-cron/README.rst | 28 ------------------- .../roles/ansible-cron/defaults/main.yaml | 8 ------ playbooks/roles/ansible-cron/tasks/main.yaml | 15 ---------- playbooks/service-bridge.yaml | 1 - 5 files changed, 53 deletions(-) delete mode 100644 playbooks/roles/ansible-cron/README.rst delete mode 100644 playbooks/roles/ansible-cron/defaults/main.yaml delete mode 100644 playbooks/roles/ansible-cron/tasks/main.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 97c3f78025..e6db34e504 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1560,7 +1560,6 @@ files: - playbooks/service-bridge.yaml - playbooks/host_vars/bridge.openstack.org.yaml - - playbooks/roles/ansible-cron/.* - playbooks/roles/logrotate/.* - playbooks/roles/cloud-launcher-cron/.* - playbooks/roles/edit-secrets-script/.* diff --git a/playbooks/roles/ansible-cron/README.rst b/playbooks/roles/ansible-cron/README.rst deleted file mode 100644 index 75bf33379d..0000000000 --- a/playbooks/roles/ansible-cron/README.rst +++ /dev/null @@ -1,28 +0,0 @@ -Setup periodic runs of ``run_all.sh``, which runs playbooks against -bridge.o.o and all hosts. - -**Role Variables** - -.. zuul:rolevar:: update_cron_interval - - .. zuul:rolevar:: minute - :default: 15 - - .. zuul:rolevar:: hour - :default: * - - .. zuul:rolevar:: day - :default: * - - .. zuul:rolevar:: month - :default: * - - .. zuul:rolevar:: weekday - :default: * - - .. zuul:rolevar:: ansible_cron_disable_job - :default: false - - Disabled installed cron job. This is only useful for CI jobs - testing bridge.o.o so that the test host does not randomly run - the script during CI tests that fall during the interval. diff --git a/playbooks/roles/ansible-cron/defaults/main.yaml b/playbooks/roles/ansible-cron/defaults/main.yaml deleted file mode 100644 index b29615f20a..0000000000 --- a/playbooks/roles/ansible-cron/defaults/main.yaml +++ /dev/null @@ -1,8 +0,0 @@ -update_cron_interval: - minute: '*/15' - hour: '*' - day: '*' - month: '*' - weekday: '*' -# Flag that can be set in tests to ensure cron is not run -ansible_cron_disable_job: false diff --git a/playbooks/roles/ansible-cron/tasks/main.yaml b/playbooks/roles/ansible-cron/tasks/main.yaml deleted file mode 100644 index 8be8c98ebd..0000000000 --- a/playbooks/roles/ansible-cron/tasks/main.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- name: Ensure directory exists for lock files - file: - state: directory - path: /var/run/ansible - -- name: Set PATH for cron - cron: - name: PATH - env: yes - value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - -- name: Set up cron job for running run_all.sh - cron: - name: run_all.sh - state: absent diff --git a/playbooks/service-bridge.yaml b/playbooks/service-bridge.yaml index 1eeea3ef03..c8fa151bbd 100644 --- a/playbooks/service-bridge.yaml +++ b/playbooks/service-bridge.yaml @@ -1,7 +1,6 @@ - hosts: bridge.openstack.org:!disabled name: "Bridge: configure the bastion host" roles: - - ansible-cron - cloud-launcher-cron - edit-secrets-script - install-kubectl