From c4138d820da7aad9ee4a65fde4ceb9f04c64e6c6 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Tue, 15 Mar 2022 02:24:39 -0400 Subject: [PATCH] add initial resolv_conf role; fixes for etc_hosts --- .gitignore | 1 + roles/etc_hosts/tasks/main.yml | 2 +- roles/etc_hosts/templates/etc_hosts.j2 | 1 + roles/resolv_conf/README.md | 38 ++++++++++++++++ roles/resolv_conf/defaults/main.yml | 22 +++++++++ roles/resolv_conf/files/.keep | 0 roles/resolv_conf/handlers/main.yml | 2 + roles/resolv_conf/meta/main.yml | 52 ++++++++++++++++++++++ roles/resolv_conf/tasks/main.yml | 15 +++++++ roles/resolv_conf/templates/.keep | 0 roles/resolv_conf/templates/resolv_conf.j2 | 16 +++++++ roles/resolv_conf/tests/inventory | 2 + roles/resolv_conf/tests/test.yml | 5 +++ roles/resolv_conf/vars/main.yml | 2 + 14 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 roles/resolv_conf/README.md create mode 100644 roles/resolv_conf/defaults/main.yml create mode 100644 roles/resolv_conf/files/.keep create mode 100644 roles/resolv_conf/handlers/main.yml create mode 100644 roles/resolv_conf/meta/main.yml create mode 100644 roles/resolv_conf/tasks/main.yml create mode 100644 roles/resolv_conf/templates/.keep create mode 100644 roles/resolv_conf/templates/resolv_conf.j2 create mode 100644 roles/resolv_conf/tests/inventory create mode 100644 roles/resolv_conf/tests/test.yml create mode 100644 roles/resolv_conf/vars/main.yml diff --git a/.gitignore b/.gitignore index 94552b8..6baa6c2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ roles/* !roles/.keep !roles/etc_hosts !roles/base_packages +!roles/resolv_conf diff --git a/roles/etc_hosts/tasks/main.yml b/roles/etc_hosts/tasks/main.yml index d7b9f0d..a510bc9 100644 --- a/roles/etc_hosts/tasks/main.yml +++ b/roles/etc_hosts/tasks/main.yml @@ -6,7 +6,7 @@ - ansible_virtualization_type == "docker" -- name: deploy {{ __etc_hosts_file }} +- name: Deploy {{ __etc_hosts_file }} template: src: templates/etc_hosts.j2 dest: "{{ __etc_hosts_file }}" diff --git a/roles/etc_hosts/templates/etc_hosts.j2 b/roles/etc_hosts/templates/etc_hosts.j2 index 1b84324..e1e1d26 100644 --- a/roles/etc_hosts/templates/etc_hosts.j2 +++ b/roles/etc_hosts/templates/etc_hosts.j2 @@ -1,3 +1,4 @@ +############################################### # {{ __template_header }} ############################################### # diff --git a/roles/resolv_conf/README.md b/roles/resolv_conf/README.md new file mode 100644 index 0000000..225dd44 --- /dev/null +++ b/roles/resolv_conf/README.md @@ -0,0 +1,38 @@ +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/resolv_conf/defaults/main.yml b/roles/resolv_conf/defaults/main.yml new file mode 100644 index 0000000..a47b8ee --- /dev/null +++ b/roles/resolv_conf/defaults/main.yml @@ -0,0 +1,22 @@ +--- +__project_author : Chris Hammer +__project_email : chris@thezengarden.net +__project_repo : https://github.com/jchristianh-ansible-collections/baseos + + +__template_header : The Zen Garden + + +__resolv_conf_file : /etc/resolv.conf +__resolv_conf_file_docker : /etc/resolv.conf.docker +__resolv_conf_version : 1.0.0 +__resolv_conf_revision : 22315 + + +__search_domain : thezengarden.net +__nameservers : + - 10.10.10.55 + - 10.1.1.210 + + +... diff --git a/roles/resolv_conf/files/.keep b/roles/resolv_conf/files/.keep new file mode 100644 index 0000000..e69de29 diff --git a/roles/resolv_conf/handlers/main.yml b/roles/resolv_conf/handlers/main.yml new file mode 100644 index 0000000..b40f790 --- /dev/null +++ b/roles/resolv_conf/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for resolv_conf diff --git a/roles/resolv_conf/meta/main.yml b/roles/resolv_conf/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/roles/resolv_conf/meta/main.yml @@ -0,0 +1,52 @@ +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/resolv_conf/tasks/main.yml b/roles/resolv_conf/tasks/main.yml new file mode 100644 index 0000000..b0ce6c5 --- /dev/null +++ b/roles/resolv_conf/tasks/main.yml @@ -0,0 +1,15 @@ +--- +- name: Set resolv_conf_file if running in Docker + set_fact: + __resolv_conf_file: "{{ __resolv_conf_file_docker }}" + when: ansible_virtualization_type == "docker" + + +- name: Deploy {{ __resolv_conf_file }} + template: + src: templates/resolv_conf.j2 + dest: "{{ __resolv_conf_file }}" + mode: 0644 + + +... diff --git a/roles/resolv_conf/templates/.keep b/roles/resolv_conf/templates/.keep new file mode 100644 index 0000000..e69de29 diff --git a/roles/resolv_conf/templates/resolv_conf.j2 b/roles/resolv_conf/templates/resolv_conf.j2 new file mode 100644 index 0000000..91b490d --- /dev/null +++ b/roles/resolv_conf/templates/resolv_conf.j2 @@ -0,0 +1,16 @@ +############################################### +# {{ __template_header }} +############################################### +# +# Configuration : {{ __resolv_conf_file }} +# Template Version : {{ __resolv_conf_version}}-{{ __resolv_conf_revision }} +# +# {{ __project_author }} ({{ __project_email }}) +############################################### + + +search {{ __search_domain }} +{% for item in __nameservers %} +nameserver {{ item }} +{% endfor %} + diff --git a/roles/resolv_conf/tests/inventory b/roles/resolv_conf/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/roles/resolv_conf/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/roles/resolv_conf/tests/test.yml b/roles/resolv_conf/tests/test.yml new file mode 100644 index 0000000..004ec38 --- /dev/null +++ b/roles/resolv_conf/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - resolv_conf diff --git a/roles/resolv_conf/vars/main.yml b/roles/resolv_conf/vars/main.yml new file mode 100644 index 0000000..ad7a228 --- /dev/null +++ b/roles/resolv_conf/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for resolv_conf