From 7db2e3df756bee51a58b31377d119ce614153ece Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 01:53:17 -0500 Subject: [PATCH] lots of cleanup; removal of some roles we are not actually going to rewrite or use --- ansible.cfg | 34 -------------- docs/.keep | 0 galaxy.yml | 2 +- meta/runtime.yml | 2 +- plugins/README.md | 31 ------------ roles/base_packages/files/.keep | 0 roles/base_packages/handlers/main.yml | 2 - roles/base_packages/templates/.keep | 0 roles/bashrc/defaults/main.yml | 2 - roles/bashrc/handlers/main.yml | 2 - roles/bashrc/vars/main.yml | 2 - roles/default_services/files/.keep | 0 roles/default_services/handlers/main.yml | 2 - roles/default_services/templates/.keep | 0 roles/default_services/vars/main.yml | 2 - roles/etc_hosts/defaults/main.yml | 1 - roles/etc_hosts/files/.keep | 0 roles/etc_hosts/tasks/main.yml | 2 +- roles/etc_hosts/vars/main.yml | 2 - roles/hostname/defaults/main.yml | 2 - roles/hostname/handlers/main.yml | 10 ++-- roles/hostname/vars/main.yml | 2 - roles/ipa_client/README.md | 38 --------------- roles/ipa_client/defaults/main.yml | 7 --- roles/ipa_client/files/.keep | 0 roles/ipa_client/handlers/main.yml | 2 - roles/ipa_client/meta/main.yml | 52 --------------------- roles/ipa_client/tasks/main.yml | 14 ------ roles/ipa_client/templates/.keep | 0 roles/ipa_client/tests/inventory | 2 - roles/ipa_client/tests/test.yml | 5 -- roles/ipa_client/vars/main.yml | 2 - roles/motd/files/.keep | 0 roles/motd/handlers/main.yml | 2 - roles/motd/vars/main.yml | 2 - roles/resolv_conf/files/.keep | 0 roles/resolv_conf/handlers/main.yml | 2 - roles/resolv_conf/vars/main.yml | 2 - roles/snmpd_conf/files/.keep | 0 roles/update_all_packages/defaults/main.yml | 2 - roles/update_all_packages/files/.keep | 0 roles/update_all_packages/handlers/main.yml | 2 - roles/update_all_packages/templates/.keep | 0 roles/update_all_packages/vars/main.yml | 2 - 44 files changed, 8 insertions(+), 228 deletions(-) delete mode 100644 ansible.cfg delete mode 100644 docs/.keep delete mode 100644 plugins/README.md delete mode 100644 roles/base_packages/files/.keep delete mode 100644 roles/base_packages/handlers/main.yml delete mode 100644 roles/base_packages/templates/.keep delete mode 100644 roles/bashrc/defaults/main.yml delete mode 100644 roles/bashrc/handlers/main.yml delete mode 100644 roles/bashrc/vars/main.yml delete mode 100644 roles/default_services/files/.keep delete mode 100644 roles/default_services/handlers/main.yml delete mode 100644 roles/default_services/templates/.keep delete mode 100644 roles/default_services/vars/main.yml delete mode 100644 roles/etc_hosts/files/.keep delete mode 100644 roles/etc_hosts/vars/main.yml delete mode 100644 roles/hostname/defaults/main.yml delete mode 100644 roles/hostname/vars/main.yml delete mode 100644 roles/ipa_client/README.md delete mode 100644 roles/ipa_client/defaults/main.yml delete mode 100644 roles/ipa_client/files/.keep delete mode 100644 roles/ipa_client/handlers/main.yml delete mode 100644 roles/ipa_client/meta/main.yml delete mode 100644 roles/ipa_client/tasks/main.yml delete mode 100644 roles/ipa_client/templates/.keep delete mode 100644 roles/ipa_client/tests/inventory delete mode 100644 roles/ipa_client/tests/test.yml delete mode 100644 roles/ipa_client/vars/main.yml delete mode 100644 roles/motd/files/.keep delete mode 100644 roles/motd/handlers/main.yml delete mode 100644 roles/motd/vars/main.yml delete mode 100644 roles/resolv_conf/files/.keep delete mode 100644 roles/resolv_conf/handlers/main.yml delete mode 100644 roles/resolv_conf/vars/main.yml delete mode 100644 roles/snmpd_conf/files/.keep delete mode 100644 roles/update_all_packages/defaults/main.yml delete mode 100644 roles/update_all_packages/files/.keep delete mode 100644 roles/update_all_packages/handlers/main.yml delete mode 100644 roles/update_all_packages/templates/.keep delete mode 100644 roles/update_all_packages/vars/main.yml diff --git a/ansible.cfg b/ansible.cfg deleted file mode 100644 index 513b10f..0000000 --- a/ansible.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[defaults] -inventory = /etc/ansible/zen_inventory.yml -roles_path = /etc/ansible/roles -collections_path = /etc/ansible/collections -remote_tmp = /tmp/.ansible-${USER}/tmp -gathering = smart -gather_timeout = 30 -fact_path = /etc/ansible/facts -fact_caching = jsonfile -fact_caching_connection = facts.d -fact_caching_timeout = 300 -retry_files_enabled = False -forks = 40 -timeout = 30 -host_key_checking = False -display_skipped_hosts = False -bin_ansible_callbacks = True -callback_whitelist = ansible.posix.profile_tasks, ansible.posix.timer -deprecation_warnings = False -command_warnings = False - - -[ssh_connection] -pipelining = True -ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o PreferredAuthentications=publickey - - -[galaxy] -server_list = pah - - -[galaxy_server.pah] -url=https://hub.thezengarden.net/api/galaxy/content/inbound-jchristianh/ -token=1a9e01d61c2528a3661f1a6ceea07dafeca63198 diff --git a/docs/.keep b/docs/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/galaxy.yml b/galaxy.yml index 15ce2b4..24a60c3 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -8,7 +8,7 @@ namespace: jchristianh name: baseos # The version of the collection. Must be compatible with semantic versioning -version: 1.0.7 +version: 1.0.8 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/meta/runtime.yml b/meta/runtime.yml index 4f8988b..1205f86 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,2 +1,2 @@ --- -requires_ansible: ">=2.10" +requires_ansible: ">=2.14" diff --git a/plugins/README.md b/plugins/README.md deleted file mode 100644 index 775d977..0000000 --- a/plugins/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# Collections Plugins Directory - -This directory can be used to ship various plugins inside an Ansible collection. Each plugin is placed in a folder that -is named after the type of plugin it is in. It can also include the `module_utils` and `modules` directory that -would contain module utils and modules respectively. - -Here is an example directory of the majority of plugins currently supported by Ansible: - -``` -└── plugins - ├── action - ├── become - ├── cache - ├── callback - ├── cliconf - ├── connection - ├── filter - ├── httpapi - ├── inventory - ├── lookup - ├── module_utils - ├── modules - ├── netconf - ├── shell - ├── strategy - ├── terminal - ├── test - └── vars -``` - -A full list of plugin types can be found at [Working With Plugins](https://docs.ansible.com/ansible-core/2.12/plugins/plugins.html). diff --git a/roles/base_packages/files/.keep b/roles/base_packages/files/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/base_packages/handlers/main.yml b/roles/base_packages/handlers/main.yml deleted file mode 100644 index b93128a..0000000 --- a/roles/base_packages/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for base_packages diff --git a/roles/base_packages/templates/.keep b/roles/base_packages/templates/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/bashrc/defaults/main.yml b/roles/bashrc/defaults/main.yml deleted file mode 100644 index 3887e66..0000000 --- a/roles/bashrc/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for bashrc diff --git a/roles/bashrc/handlers/main.yml b/roles/bashrc/handlers/main.yml deleted file mode 100644 index 289b36b..0000000 --- a/roles/bashrc/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for bashrc diff --git a/roles/bashrc/vars/main.yml b/roles/bashrc/vars/main.yml deleted file mode 100644 index 940dd24..0000000 --- a/roles/bashrc/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for bashrc diff --git a/roles/default_services/files/.keep b/roles/default_services/files/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/default_services/handlers/main.yml b/roles/default_services/handlers/main.yml deleted file mode 100644 index d1be361..0000000 --- a/roles/default_services/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for default_services diff --git a/roles/default_services/templates/.keep b/roles/default_services/templates/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/default_services/vars/main.yml b/roles/default_services/vars/main.yml deleted file mode 100644 index 109f5a1..0000000 --- a/roles/default_services/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for default_services diff --git a/roles/etc_hosts/defaults/main.yml b/roles/etc_hosts/defaults/main.yml index 5735d01..88fa1a7 100644 --- a/roles/etc_hosts/defaults/main.yml +++ b/roles/etc_hosts/defaults/main.yml @@ -8,7 +8,6 @@ __template_header : The Zen Garden __etc_hosts_file : /etc/hosts -__etc_hosts_file_docker : /etc/hosts.docker __etc_hosts_version : 1.0.0 __etc_hosts_revision : 22314 diff --git a/roles/etc_hosts/files/.keep b/roles/etc_hosts/files/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/etc_hosts/tasks/main.yml b/roles/etc_hosts/tasks/main.yml index a510bc9..1b2941d 100644 --- a/roles/etc_hosts/tasks/main.yml +++ b/roles/etc_hosts/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Set etc_hosts_file if running in Docker set_fact: - etc_hosts_file: "{{ __etc_hosts_file_docker }}" + etc_hosts_file: "{{ __etc_hosts_file }}.docker" when: - ansible_virtualization_type == "docker" diff --git a/roles/etc_hosts/vars/main.yml b/roles/etc_hosts/vars/main.yml deleted file mode 100644 index 832d6fd..0000000 --- a/roles/etc_hosts/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for etc_hosts diff --git a/roles/hostname/defaults/main.yml b/roles/hostname/defaults/main.yml deleted file mode 100644 index 6d6b22d..0000000 --- a/roles/hostname/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for hostname diff --git a/roles/hostname/handlers/main.yml b/roles/hostname/handlers/main.yml index 0618bfa..60d43c5 100644 --- a/roles/hostname/handlers/main.yml +++ b/roles/hostname/handlers/main.yml @@ -4,7 +4,6 @@ name : rsyslog state : restarted - - name: restart_syslog_centos_8 service: name : syslog @@ -15,29 +14,30 @@ name : rsyslog state : restarted - - name: restart_syslog_redhat_8 service: name : rsyslog state : restarted - - name: restart_syslog_redhat_9 service: name : rsyslog state : restarted - - name: restart_syslog_debian_11 service: name : rsyslog state : restarted - - name: restart_syslog_fedora_35 service: name : rsyslog state : restarted +- name: restart_syslog_fedora_38 + service: + name : rsyslog + state : started + ... diff --git a/roles/hostname/vars/main.yml b/roles/hostname/vars/main.yml deleted file mode 100644 index 3afc2e0..0000000 --- a/roles/hostname/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for hostname diff --git a/roles/ipa_client/README.md b/roles/ipa_client/README.md deleted file mode 100644 index 225dd44..0000000 --- a/roles/ipa_client/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/ipa_client/defaults/main.yml b/roles/ipa_client/defaults/main.yml deleted file mode 100644 index 019a274..0000000 --- a/roles/ipa_client/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -do_ipa_registration : True - - -ipa_domain : thezengarden.net -ipa_auth_server : ipa.thezengarden.net -ipa_otp : Bap2e5adcWoHZtEPE diff --git a/roles/ipa_client/files/.keep b/roles/ipa_client/files/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/ipa_client/handlers/main.yml b/roles/ipa_client/handlers/main.yml deleted file mode 100644 index c945aca..0000000 --- a/roles/ipa_client/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for ipa_client diff --git a/roles/ipa_client/meta/main.yml b/roles/ipa_client/meta/main.yml deleted file mode 100644 index c572acc..0000000 --- a/roles/ipa_client/meta/main.yml +++ /dev/null @@ -1,52 +0,0 @@ -galaxy_info: - author: your name - description: your role description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) - - min_ansible_version: 2.1 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/roles/ipa_client/tasks/main.yml b/roles/ipa_client/tasks/main.yml deleted file mode 100644 index 640e358..0000000 --- a/roles/ipa_client/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Check for existing IPA registration - lineinfile: - path: /etc/krb5.conf - regexp: "{{ ipa_auth_server }}" - state: absent - changed_when: false - register: ipa_registered_check - - -- name: Register system against IPA server - command: ipa-client-install --server {{ ipa_auth_server }}\ - --domain {{ ipa_domain }} --mkhomedir -w {{ ipa_otp }} --unattended - when: not ipa_registered_check.found diff --git a/roles/ipa_client/templates/.keep b/roles/ipa_client/templates/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/ipa_client/tests/inventory b/roles/ipa_client/tests/inventory deleted file mode 100644 index 878877b..0000000 --- a/roles/ipa_client/tests/inventory +++ /dev/null @@ -1,2 +0,0 @@ -localhost - diff --git a/roles/ipa_client/tests/test.yml b/roles/ipa_client/tests/test.yml deleted file mode 100644 index 341c090..0000000 --- a/roles/ipa_client/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - ipa_client diff --git a/roles/ipa_client/vars/main.yml b/roles/ipa_client/vars/main.yml deleted file mode 100644 index 5145ad0..0000000 --- a/roles/ipa_client/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for ipa_client diff --git a/roles/motd/files/.keep b/roles/motd/files/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/motd/handlers/main.yml b/roles/motd/handlers/main.yml deleted file mode 100644 index e2da480..0000000 --- a/roles/motd/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for motd diff --git a/roles/motd/vars/main.yml b/roles/motd/vars/main.yml deleted file mode 100644 index c2e9bb7..0000000 --- a/roles/motd/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for motd diff --git a/roles/resolv_conf/files/.keep b/roles/resolv_conf/files/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/resolv_conf/handlers/main.yml b/roles/resolv_conf/handlers/main.yml deleted file mode 100644 index b40f790..0000000 --- a/roles/resolv_conf/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for resolv_conf diff --git a/roles/resolv_conf/vars/main.yml b/roles/resolv_conf/vars/main.yml deleted file mode 100644 index ad7a228..0000000 --- a/roles/resolv_conf/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for resolv_conf diff --git a/roles/snmpd_conf/files/.keep b/roles/snmpd_conf/files/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/update_all_packages/defaults/main.yml b/roles/update_all_packages/defaults/main.yml deleted file mode 100644 index fbd13d0..0000000 --- a/roles/update_all_packages/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for roles/update_all_packages diff --git a/roles/update_all_packages/files/.keep b/roles/update_all_packages/files/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/update_all_packages/handlers/main.yml b/roles/update_all_packages/handlers/main.yml deleted file mode 100644 index 3057ce7..0000000 --- a/roles/update_all_packages/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for roles/update_all_packages diff --git a/roles/update_all_packages/templates/.keep b/roles/update_all_packages/templates/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/roles/update_all_packages/vars/main.yml b/roles/update_all_packages/vars/main.yml deleted file mode 100644 index 8ec5e8e..0000000 --- a/roles/update_all_packages/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for roles/update_all_packages