Skip to content

Commit d19f6eb

Browse files
authored
fix: remove config-template (#674)
* fix: remove config-template The config-template module, while useful, wasn't being used, so we removed it. Signed-off-by: Kevin Carter <[email protected]> * fix: remove ansible_managed this var is no longer magic Signed-off-by: Kevin Carter <[email protected]> --------- Signed-off-by: Kevin Carter <[email protected]>
1 parent 7e5b098 commit d19f6eb

File tree

8 files changed

+0
-32
lines changed

8 files changed

+0
-32
lines changed

ansible-collection-requirements.yml

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ collections:
88
- name: https://github.com/ansible-collections/community.general
99
version: 8.2.0
1010
type: git
11-
- name: https://opendev.org/openstack/ansible-config_template
12-
version: 2.1.0
13-
type: git
1411
- name: https://github.com/ansible-collections/kubernetes.core
1512
version: 3.2.0
1613
type: git

ansible/roles/host_setup/defaults/main.yml

-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ host_environment_path:
2929
- /sbin
3030
- /bin
3131

32-
# Allows the ability to override or add extra parameters to the systemd global config
33-
# that will be applied by default to all units
34-
systemd_global_overrides: {}
35-
3632
# The following garbage collection values are set to better support lots of neutron networks/routers.
3733
# Used for setting the net.ipv4/6.neigh.default.gc_thresh* values. This assumes that facts were
3834
# gathered to obtain the total amount of memory available on a given host. If no facts are gathered

ansible/roles/host_setup/handlers/main.yml

-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,3 @@
2828
until: _restart is success
2929
retries: 5
3030
delay: 2
31-
32-
- name: Systemd daemon reload
33-
systemd:
34-
daemon_reload: yes

ansible/roles/host_setup/tasks/main.yml

-12
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,6 @@
5555
group: "root"
5656
mode: "0755"
5757

58-
- name: Add DefaultEnvironment to systemd
59-
openstack.config_template.config_template:
60-
src: systemd-environment.j2
61-
dest: /etc/systemd/system.conf.d/genestack-default-environment.conf
62-
owner: "root"
63-
group: "root"
64-
mode: "0644"
65-
config_overrides: "{{ systemd_global_overrides }}"
66-
config_type: ini
67-
notify: Systemd daemon reload
68-
when: systemd_global_overrides is defined
69-
7058
- name: Remove the blacklisted packages
7159
package:
7260
name: "{{ host_package_list | selectattr('state', 'equalto', 'absent') | map(attribute='name') | list }}"

ansible/roles/host_setup/templates/modprobe.conf.j2

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# {{ ansible_managed }}
21
# Modules from the genestack host_setup role
32
{% for module in host_kernel_modules + host_specific_kernel_modules %}
43
{{ module.name }}

ansible/roles/host_setup/templates/sysstat.cron.debian.j2

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# {{ ansible_managed }}
2-
31
# The first element of the path is a directory where the debian-sa1 script is located
42
PATH=/usr/lib/sysstat:/usr/sbin:/usr/sbin:/usr/bin:/sbin:/bin
53

ansible/roles/host_setup/templates/sysstat.default.j2

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# {{ ansible_managed }}
2-
31
#
42
# Default settings for /etc/init.d/sysstat, /etc/cron.d/sysstat
53
# and /etc/cron.daily/sysstat files

ansible/roles/host_setup/templates/systemd-environment.j2

-4
This file was deleted.

0 commit comments

Comments
 (0)