diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bfe9818..0000000 --- a/.gitignore +++ /dev/null @@ -1,71 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -sdist/ -var/ -ansible_role_chrony.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*,cover - -# Translations -*.mo -*.pot - -# Django stuff: -*.log - -# Sphinx documentation -doc/build/ - -# PyBuilder -target/ - -# virtualenv -.venv/ - -# jenkins config -jenkins/config.ini -playbooks/debug.yml - -# Files created by releasenotes build -releasenotes/build - -# Editors -.*.sw[klmnop] - -# ansible retry files -*.retry diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 68c771a..0000000 --- a/LICENSE +++ /dev/null @@ -1,176 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - diff --git a/README.rst b/README.rst index 03ab30b..4ee2c5f 100644 --- a/README.rst +++ b/README.rst @@ -1,114 +1,10 @@ -chrony -====== +This project is no longer maintained. -A role to manage chrony +The contents of this repository are still available in the Git +source code management system. To see the contents of this +repository before it reached its end of life, please check out the +previous commit with "git checkout HEAD^1". -Role Variables --------------- - -.. list-table:: Variables used for chrony - :widths: auto - :header-rows: 1 - - * - Name - - Default Value - - Description - * - `chrony_debug` - - `False` - - Enable debug option in chrony - * - `chrony_role_action` - - `all` - - Ansible action when including the role. Should be one of: [all|install|config|upgrade|online] - * - `chrony_package_name` - - `chrony` - - chrony system package name - * - `chrony_service_name` - - `chronyd` - - chrony system service name - * - `chrony_manage_service` - - `True` - - Flag used to specific if the ansible role should manage the service - * - `chrony_manage_package` - - `True` - - Flag used to specific if the ansible role should manage the package - * - `chrony_service_state` - - `started` - - Default service state to configure (started|stopped) - * - `chrony_config_file_location` - - `/etc/chrony.conf` - - Chrony configuration file location. - * - `chrony_driftfile_path` - - `/var/lib/chrony/drift` - - Chrony drift file location - * - `chrony_logdir_path` - - `/var/log/chrony` - - Chrony log directory location - * - `chrony_ntp_servers` - - `[]` - - List of NTP servers. This can be a list of hashes for advanced configuration. - If using the hash format, a `server_name` and `server_settings` key should be populated with - the appropriate data. If this is a list of hostnames, the `chrony_global_server_settings` - will be appended to the configuration. - * - `chrony_global_server_settings` - - `` - - Default setting to apply to the servers configuration - * - `chrony_ntp_pools` - - `[]` - - List of NTP pools. This can be a list of hashes for advanced configuration. - If using the hash format, a `pool_name` and `pool_settings` key should be populated with - the appropriate data. If this is a list of hostnames, the `chrony_global_pool_settings` - will be appended to the configuration. - * - `chrony_global_pool_settings` - - `` - - Default setting to apply to the pools configuration - * - `chrony_ntp_peers` - - `[]` - - List of NTP peers. This can be a list of hashes for advanced configuration. - If using the hash format, a `peer_name` and `peer_settings` key should be populated with - the appropriate data. If this is a list of hostnames, the `chrony_global_peer_settings` - will be appended to the configuration. - * - `chrony_global_peer_settings` - - `` - - Default setting to apply to the peers configuration - * - `chrony_bind_addresses` - - `['127.0.0.1', '::1']` - - List of addresses to bind to to listen for command packets - * - `chrony_acl_rules` - - `[]` - - List of specific allow/deny commands for the configuration file - * - `chrony_rtc_settings` - - `['rtcsync']` - - List of specific real time lock settings - * - `chrony_makestep` - - `1.0 3` - - The chrony makestep configuration - * - `chrony_extra_options` - - `[]` - - A list of extra option strings that is added to the end of the configuration file. This list is joined with new lines. - - -Requirements ------------- - - - ansible >= 2.4 - - python >= 2.6 - -Dependencies ------------- - -None - -Example Playbooks ------------------ - -.. code-block:: - - - hosts: localhost - become: true - roles: - - chrony - -License -------- - -Apache 2.0 +For any further questions, please email +openstack-discuss@lists.openstack.org or join #openstack-dev on +OFTC. diff --git a/ansible-requirements.txt b/ansible-requirements.txt deleted file mode 100644 index 540637e..0000000 --- a/ansible-requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -# These are required here because ansible can't be in global-requirements due -# to licensing conflicts. But we sill need to be able to pull them in for -# lint checks and want to document these as ansible specific things that may -# be required for this repository. -ansible<2.10 -ansible-lint<4.3.0 diff --git a/ansible.cfg b/ansible.cfg deleted file mode 100644 index a50fc53..0000000 --- a/ansible.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[defaults] -gathering = smart -command_warnings = False -retry_files_enabled = False -callback_whitelist = profile_tasks - -# Attempt to load custom modules whether it's installed system-wide or from a virtual environment -roles_path = roles:$VIRTUAL_ENV/usr/share/ansible/roles/chrony:$VIRTUAL_ENV/usr/local/share/ - - -[ssh_connection] -control_path = %(directory)s/%%C diff --git a/ci-scripts/ansible-lint.sh b/ci-scripts/ansible-lint.sh deleted file mode 100644 index 65e2245..0000000 --- a/ci-scripts/ansible-lint.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# ANSIBLE0006: Using command rather than module -# we have a few use cases where we need to use curl and rsync -# ANSIBLE0007: Using command rather than an argument to e.g file -# we have a lot of 'rm' command and we should use file module instead -# ANSIBLE0010: Package installs should not use latest. -# Sometimes we need to update some packages. -# ANSIBLE0012: Commands should not change things if nothing needs doing -# ANSIBLE0013: Use Shell only when shell functionality is required -# ANSIBLE0016: Tasks that run when changed should likely be handlers -# this requires refactoring roles, skipping for now -SKIPLIST="ANSIBLE0006,ANSIBLE0007,ANSIBLE0010,ANSIBLE0012,ANSIBLE0013,ANSIBLE0016" - -# Lin the role. -ansible-lint -vvv -x $SKIPLIST ./ || lint_error=1 - -# exit with 1 if we had a least an error or warning. -if [[ -n "$lint_error" ]]; then - exit 1; -fi diff --git a/defaults/main.yml b/defaults/main.yml deleted file mode 100644 index a65717e..0000000 --- a/defaults/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -chrony_debug: False -chrony_role_action: all -chrony_global_server_settings: iburst minpoll 6 maxpoll 10 -chrony_global_pool_settings: iburst minpoll 6 maxpoll 10 -chrony_ntp_servers: - - '0.pool.ntp.org' - - '1.pool.ntp.org' - - '2.pool.ntp.org' - - '3.pool.ntp.org' -chrony_ntp_pools: [] -chrony_ntp_peers: [] -chrony_bind_addresses: - - 127.0.0.1 - - ::1 -chrony_acl_rules: ['deny all'] -chrony_service_name: chronyd -chrony_manage_service: True -chrony_manage_package: True -chrony_service_state: started -chrony_extra_options: [] -chrony_config_file_location: /etc/chrony.conf diff --git a/files/chrony-online.service b/files/chrony-online.service deleted file mode 100644 index c9ad167..0000000 --- a/files/chrony-online.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=chronyd online sources service -After=network-online.target chronyd.service -Wants=network-online.target chronyd.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/chronyc online -User=root - -[Install] -WantedBy=multi-user.target diff --git a/handlers/main.yml b/handlers/main.yml deleted file mode 100644 index 71bcf24..0000000 --- a/handlers/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Restart chronyd - service: - name: "{{ chrony_service_name }}" - state: restarted - when: chrony_manage_service|bool diff --git a/install.yml b/install.yml deleted file mode 100644 index 1267abe..0000000 --- a/install.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- hosts: undercloud - gather_facts: true - become: true - tasks: - - include_role: - name: tripleo-chrony diff --git a/meta/main.yml b/meta/main.yml deleted file mode 100644 index 61439b8..0000000 --- a/meta/main.yml +++ /dev/null @@ -1,18 +0,0 @@ -galaxy_info: - role_name: chrony - author: tripleo - description: chrony role - company: Red Hat - license: Apache 2.0 - min_ansible_version: 2.4 - - platforms: - - name: EL - versions: - - 7 - - galaxy_tags: - - openstack - - tripleo - -dependencies: [] diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 6560a97..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pbr>=1.6 -ansible<2.10 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 7707847..0000000 --- a/setup.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[metadata] -name = ansible-role-chrony -summary = ansible-role-chrony - Ansible chrony role -description_file = - README.rst -author = TripleO Team -author_email = openstack-discuss@lists.openstack.org -home_page = https://opendev.org/openstack/ansible-role-chrony -classifier = - License :: OSI Approved :: Apache Software License - Development Status :: 4 - Beta - Intended Audience :: Developers - Intended Audience :: System Administrators - Intended Audience :: Information Technology - Topic :: Utilities - -[global] -setup_hooks = - pbr.hooks.setup_hook - -[files] -data_files = - share/ansible/roles/chrony/defaults = defaults/* - share/ansible/roles/chrony/files = files/* - share/ansible/roles/chrony/handlers = handlers/* - share/ansible/roles/chrony/meta = meta/* - share/ansible/roles/chrony/tasks = tasks/* - share/ansible/roles/chrony/templates = templates/* - share/ansible/roles/chrony/tests = tests/* - share/ansible/roles/chrony/vars = vars/* - -[wheel] -universal = 1 - -[pbr] -skip_authors = True -skip_changelog = True - diff --git a/setup.py b/setup.py deleted file mode 100644 index 58ffb52..0000000 --- a/setup.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 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. - -import setuptools - -setuptools.setup( - setup_requires=['pbr'], - py_modules=[], - pbr=True) diff --git a/tasks/config.yml b/tasks/config.yml deleted file mode 100644 index 313b0fd..0000000 --- a/tasks/config.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# Copyright 2022 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: Load distro-specific variables - include_tasks: vars.yml - -- name: Install chrony configuration file - template: - src: chrony.conf.j2 - dest: "{{ chrony_config_file_location }}" - owner: root - group: root - mode: 0644 - register: chrony_config - notify: Restart chronyd diff --git a/tasks/install.yml b/tasks/install.yml deleted file mode 100644 index 71d8452..0000000 --- a/tasks/install.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -# Copyright 2022 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: Load distro-specific variables - include_tasks: vars.yml - -- name: Check for NTP service - shell: systemctl is-active ntpd.service || systemctl is-enabled ntpd.service - failed_when: false - register: ntp_service_check - -- name: Disable NTP before configuring Chrony - service: - name: ntpd - state: stopped - enabled: false - when: - - not ansible_check_mode - - ntp_service_check.rc is defined - - ntp_service_check.rc == 0 - -- name: Install chronyd package - package: - name: "{{ chrony_package_name }}" - state: present - when: chrony_manage_package|bool diff --git a/tasks/main.yml b/tasks/main.yml deleted file mode 100644 index 49f9103..0000000 --- a/tasks/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Copyright 2022 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: Load distro-specific variables - include_tasks: vars.yml - -- name: Install chronyd - include_tasks: install.yml - when: chrony_role_action in ['all', 'install'] - -- name: Upgrade chronyd - include_tasks: upgrade.yml - when: chrony_role_action in ['upgrade'] - -- name: Configure chronyd - include_tasks: config.yml - when: chrony_role_action in ['all', 'config'] - -- name: Run chronyd - include_tasks: run.yml - when: chrony_role_action in ['all', 'config', 'run'] - -- name: Enable online service - include_tasks: online.yml - when: chrony_role_action in ['all', 'online'] - -- name: Sync chronyc - include_tasks: sync.yml - when: chrony_role_action in ['all', 'sync'] diff --git a/tasks/online.yml b/tasks/online.yml deleted file mode 100644 index 42459ef..0000000 --- a/tasks/online.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Create chrony-online.service unit file - become: True - copy: - src: files/chrony-online.service - dest: /etc/systemd/system/chrony-online.service - -- name: Enable chrony-online.service - become: True - systemd: - state: started - name: chrony-online.service - enabled: true - daemon-reload: true diff --git a/tasks/run.yml b/tasks/run.yml deleted file mode 100644 index 2f9cb52..0000000 --- a/tasks/run.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -# Copyright 2022 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: Load distro-specific variables - include_tasks: vars.yml - -- name: Ensure chronyd is running - service: - enabled: "{{ (chrony_service_state|default('started') in ['running', 'started']) |bool }}" - name: "{{ chrony_service_name }}" - state: "{{ chrony_service_state|default('started') }}" - when: chrony_manage_service|bool - -# ansible sometimes ignores handlers when invoked elsewhere. Since we will -# likely want to restart chrony after a configuration update, let's do it here -# always. The handler will still trigger for upgrades/updates later as well. -# This won't have any effect if chrony_manage_service is set to false. -# See also https://github.com/ansible/ansible/issues/37512 -- name: Force chronyd restart - service: - name: "{{ chrony_service_name }}" - state: restarted - when: - - chrony_manage_service|bool - - chrony_config.changed|default(false) diff --git a/tasks/sync.yml b/tasks/sync.yml deleted file mode 100644 index daff882..0000000 --- a/tasks/sync.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Copyright 2022 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: Force NTP sync - command: chronyc makestep - -- name: Ensure system is NTP time synced - command: chronyc waitsync 30 diff --git a/tasks/upgrade.yml b/tasks/upgrade.yml deleted file mode 100644 index 98850a2..0000000 --- a/tasks/upgrade.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Upgrade chronyd package - package: - name: chronyd - statue: latest - when: chrony_manage_package|bool - notify: Restart chronyd diff --git a/tasks/vars.yml b/tasks/vars.yml deleted file mode 100644 index f8ea689..0000000 --- a/tasks/vars.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Copyright 2022 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: Load distro-specific variables - include_vars: "{{ item }}" - with_first_found: - - "{{ ansible_facts['distribution'] }}.yml" - - "{{ ansible_facts['os_family'] }}.yml" - - default.yml diff --git a/templates/chrony.conf.j2 b/templates/chrony.conf.j2 deleted file mode 100644 index 73136a8..0000000 --- a/templates/chrony.conf.j2 +++ /dev/null @@ -1,63 +0,0 @@ -# Do not manually edit this file. -# Managed by ansible-role-chrony -{% for server in chrony_ntp_servers -%} -{% if server is mapping %} -server {{ server.server_host }} {{ server.server_settings }} -{% else %} -server {{ server }} {{ chrony_global_server_settings|default('') }} -{% endif %} -{% endfor -%} - -{% for pool in chrony_ntp_pools -%} -{% if pool is mapping %} -pool {{ pool.pool_host }} {{ pool.pool_settings }} -{% else %} -pool {{ pool }} {{ chrony_global_pool_settings|default('') }} -{% endif %} -{% endfor -%} - -{% for peer in chrony_ntp_peers -%} -{% if peer is mapping %} -peer {{ peer.peer_host }} {{ peer.peer_settings }} -{% else %} -peer {{ peer }} {{ chrony_global_peer_settings|default('') }} -{% endif %} -{% endfor -%} - -{% if chrony_bind_addresses is defined and chrony_bind_addresses|length > 0 -%} -{% for bind_addr in chrony_bind_addresses %} -bindcmdaddress {{ bind_addr }} -{% endfor %} -{% endif -%} - -{% if chrony_acl_rules is defined and chrony_acl_rules|length > 0 -%} -{{ chrony_acl_rules|join("\n") }} -{% endif -%} - -{% if chrony_keyfile_path is defined -%} -keyfile {{ chrony_keyfile_path }} -{% endif -%} - -{% if chrony_driftfile_path is defined -%} -driftfile {{ chrony_driftfile_path }} -{% endif -%} - -{% if chrony_logdir_path is defined -%} -logdir {{ chrony_logdir_path }} -{% endif -%} - -{% if chrony_rtc_settings is defined -%} -{{ chrony_rtc_settings|join("\n") }} -{% endif -%} - -{% if chrony_log_options is defined -%} -log {{ chrony_log_options }} -{% endif -%} - -{% if chrony_makestep is defined -%} -makestep {{ chrony_makestep }} -{% endif -%} - -{% if chrony_extra_options -%} -{{ chrony_extra_options|join("\n") }} -{% endif -%} diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index b7e3128..0000000 --- a/test-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -docutils -hacking>=4.0.0,<4.1.0 # Apache-2.0 -pyflakes>=2.2.0 diff --git a/tests/all.yml b/tests/all.yml deleted file mode 100644 index 75e994c..0000000 --- a/tests/all.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- hosts: all - gather_facts: true - become: true - vars: - chrony_role_action: all - roles: - - chrony diff --git a/tests/config.yml b/tests/config.yml deleted file mode 100644 index 75ee494..0000000 --- a/tests/config.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- hosts: all - gather_facts: true - become: true - vars: - chrony_role_action: config - roles: - - chrony diff --git a/tests/install.yml b/tests/install.yml deleted file mode 100644 index 4d00fe8..0000000 --- a/tests/install.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- hosts: all - gather_facts: true - become: true - vars: - chrony_role_action: install - roles: - - chrony diff --git a/tests/inventory.yml b/tests/inventory.yml deleted file mode 100644 index 9af0787..0000000 --- a/tests/inventory.yml +++ /dev/null @@ -1,3 +0,0 @@ -all: - hosts: - localhost diff --git a/tests/upgrade.yml b/tests/upgrade.yml deleted file mode 100644 index 97850e7..0000000 --- a/tests/upgrade.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- hosts: all - gather_facts: true - become: true - vars: - chrony_role_action: upgrade - roles: - - chrony diff --git a/tox.ini b/tox.ini deleted file mode 100644 index dfd8ec6..0000000 --- a/tox.ini +++ /dev/null @@ -1,60 +0,0 @@ -[tox] -minversion = 2.0 -envlist = docs, linters -skipsdist = True - -[testenv] -usedevelop = True -install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} -setenv = VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/test-requirements.txt -allowlist_externals = bash - -[testenv:bindep] -# Do not install any requirements. We want this to be fast and work even if -# system dependencies are missing, since it's used to tell you what system -# dependencies are missing! This also means that bindep must be installed -# separately, outside of the requirements files. -deps = bindep -commands = bindep test - -[testenv:pep8] -commands = - # Run hacking/flake8 check for all python files - bash -c "git ls-files | grep -v releasenotes | xargs grep --binary-files=without-match \ - --files-with-match '^.!.*python$' \ - --exclude-dir .tox \ - --exclude-dir .git \ - --exclude-dir .eggs \ - --exclude-dir *.egg-info \ - --exclude-dir dist \ - --exclude-dir *lib/python* \ - --exclude-dir doc \ - | xargs flake8 --verbose" - -[testenv:ansible-lint] -basepython=python2 -commands = - bash ci-scripts/ansible-lint.sh - -[testenv:linters] -deps = - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/ansible-requirements.txt -commands = - {[testenv:pep8]commands} - {[testenv:ansible-lint]commands} - -[testenv:releasenotes] -whitelist_externals = bash -commands = bash -c ci-scripts/releasenotes_tox.sh - -[testenv:venv] -commands = {posargs} - -[flake8] -# E123, E125 skipped as they are invalid PEP-8. -# E265 deals with spaces inside of comments -show-source = True -ignore = E123,E125,E265 -builtins = _ diff --git a/vars/RedHat.yml b/vars/RedHat.yml deleted file mode 100644 index 804eda7..0000000 --- a/vars/RedHat.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -chrony_package_name: chrony -chrony_service_name: chronyd -chrony_config_file_location: /etc/chrony.conf -chrony_driftfile_path: /var/lib/chrony/drift -chrony_logdir_path: /var/log/chrony -chrony_makestep: 1.0 3 -chrony_rtc_settings: - - rtcsync diff --git a/vars/default.yml b/vars/default.yml deleted file mode 100644 index ed97d53..0000000 --- a/vars/default.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml deleted file mode 100644 index 0925ca7..0000000 --- a/zuul.d/layout.yaml +++ /dev/null @@ -1,22 +0,0 @@ -- project: - check: - jobs: - - openstack-tox-linters - - tripleo-ci-centos-8-standalone: - dependencies: - - openstack-tox-linters - - tripleo-ci-centos-9-standalone: - dependencies: - - openstack-tox-linters - gate: - jobs: - - openstack-tox-linters - - tripleo-ci-centos-8-standalone: - dependencies: - - openstack-tox-linters - - tripleo-ci-centos-9-standalone: - dependencies: - - openstack-tox-linters - post: - jobs: - - publish-openstack-python-branch-tarball