From e184990e303d3eb01d0ad65b809e578eaf5c54c8 Mon Sep 17 00:00:00 2001 From: kiemlicz Date: Mon, 15 Jan 2024 18:36:24 +0100 Subject: [PATCH] giving up on file_ext, using file only --- salt/dev/mongodb/server/macros.jinja | 6 +++--- salt/dev/mongodb/server/single/configure.sls | 8 ++++---- salt/dev/mongodb/server/single/install.sls | 2 +- salt/dev/redis/server/configure_cluster.sls | 2 +- salt/dev/redis/server/configure_single.sls | 4 ++-- salt/dev/redis/server/macros.jinja | 8 ++++---- salt/dev/users/projects/setup.sls | 2 +- salt/server/foreman/init.sls | 2 +- salt/server/kannel/init.sls | 2 +- salt/server/kvm/vfio.sls | 2 +- salt/server/salt/api.sls | 2 +- salt/server/salt/master.sls | 4 ++-- salt/server/salt/ssh.sls | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/salt/dev/mongodb/server/macros.jinja b/salt/dev/mongodb/server/macros.jinja index 0290b94a..272e933b 100644 --- a/salt/dev/mongodb/server/macros.jinja +++ b/salt/dev/mongodb/server/macros.jinja @@ -3,7 +3,7 @@ {% set service = mongodb.config.service + '@' + bind.port|string %} mongodb_config_{{ bind.ip }}_{{ bind.port }}: - file_ext.managed: + file.managed: - name: /etc/{{ discriminator }}.conf - source: {{ mongodb.config.source }} - makedirs: True @@ -13,7 +13,7 @@ mongodb_config_{{ bind.ip }}_{{ bind.port }}: mongodb: {{ mongodb|tojson }} discriminator: {{ discriminator }} - require: - - file_ext: {{ mongodb.config.init_location }} + - file: {{ mongodb.config.init_location }} file.directory: - names: - {{ mongodb.config.db_path }}/{{ discriminator }} @@ -23,7 +23,7 @@ mongodb_config_{{ bind.ip }}_{{ bind.port }}: - group: {{ mongodb.group }} - makedirs: True - require: - - file_ext: /etc/{{ discriminator }}.conf + - file: /etc/{{ discriminator }}.conf mongodb_start_{{ bind.ip }}_{{ bind.port }}: {% if salt['grains.get']("init") != 'systemd' %} diff --git a/salt/dev/mongodb/server/single/configure.sls b/salt/dev/mongodb/server/single/configure.sls index 2dfbfe07..8cf5d667 100644 --- a/salt/dev/mongodb/server/single/configure.sls +++ b/salt/dev/mongodb/server/single/configure.sls @@ -7,7 +7,7 @@ 'ip': mongodb.ip|default(ip()) } %} mongodb_init: - file_ext.managed: + file.managed: - name: {{ mongodb.config.init_location }} - source: {{ mongodb.config.init }} - mode: {{ mongodb.config.mode }} @@ -18,7 +18,7 @@ mongodb_init: - require: - pkg: {{ mongodb.pkg_name }} mongodb_config: - file_ext.managed: + file.managed: - name: /etc/{{ mongodb.config.service }}.conf - source: {{ mongodb.config.source }} - makedirs: True @@ -28,7 +28,7 @@ mongodb_config: mongodb: {{ mongodb|tojson }} discriminator: {{ discriminator }} - require: - - file_ext: {{ mongodb.config.init_location }} + - file: {{ mongodb.config.init_location }} file.directory: - names: - {{ mongodb.config.db_path }}/{{ discriminator }} @@ -38,7 +38,7 @@ mongodb_config: - group: {{ mongodb.group }} - makedirs: True - require: - - file_ext: /etc/{{ mongodb.config.service }}.conf + - file: /etc/{{ mongodb.config.service }}.conf - require_in: - service: {{ mongodb.config.service }} service.running: diff --git a/salt/dev/mongodb/server/single/install.sls b/salt/dev/mongodb/server/single/install.sls index 02ea5338..f459b9b9 100644 --- a/salt/dev/mongodb/server/single/install.sls +++ b/salt/dev/mongodb/server/single/install.sls @@ -17,7 +17,7 @@ mongodb: {{ pkg_latest_opts() | indent(4) }} - require: - sls: os - file_ext.managed: + file.managed: - name: {{ mongodb.config.init_location }} - source: {{ mongodb.config.init }} - mode: {{ mongodb.config.mode }} diff --git a/salt/dev/redis/server/configure_cluster.sls b/salt/dev/redis/server/configure_cluster.sls index f87686e2..c3786e74 100644 --- a/salt/dev/redis/server/configure_cluster.sls +++ b/salt/dev/redis/server/configure_cluster.sls @@ -4,7 +4,7 @@ redis_init_script: - file_ext.managed: + file.managed: - name: {{ redis.config.init_location }} - source: {{ redis.config.init }} - mode: {{ redis.config.mode }} diff --git a/salt/dev/redis/server/configure_single.sls b/salt/dev/redis/server/configure_single.sls index 11cd71fd..09dba4c6 100644 --- a/salt/dev/redis/server/configure_single.sls +++ b/salt/dev/redis/server/configure_single.sls @@ -2,7 +2,7 @@ redis_config_{{ redis.ip }}_{{ redis.port }}: - file_ext.managed: + file.managed: - name: {{ redis.config.conf_file }} - source: {{ redis.config.source }} - makedirs: True @@ -15,4 +15,4 @@ redis_config_{{ redis.ip }}_{{ redis.port }}: - name: {{ redis.config.service }} - enable: True - watch: - - file_ext: {{ redis.config.conf_file }} + - file: {{ redis.config.conf_file }} diff --git a/salt/dev/redis/server/macros.jinja b/salt/dev/redis/server/macros.jinja index 9b4db3b8..e062d452 100644 --- a/salt/dev/redis/server/macros.jinja +++ b/salt/dev/redis/server/macros.jinja @@ -9,7 +9,7 @@ {% macro redis_configure(redis, ip, port, instance_number, service) -%} redis_config_{{ ip }}_{{ port }}: - file_ext.managed: + file.managed: - name: /etc/redis/redis-{{ instance_number }}.conf - source: {{ redis.config.source }} - makedirs: True @@ -24,13 +24,13 @@ redis_config_{{ ip }}_{{ port }}: dir: {{ redis.config.dir }}-{{ instance_number }} pid: "/var/run/redis-" ~ {{ instance_number }} ~ "/redis-server.pid" - require: - - file_ext: {{ redis.config.init_location }} + - file: {{ redis.config.init_location }} {% if salt['grains.get']("init") != 'systemd' %} file.symlink: - name: /etc/init.d/redis-server-{{ instance_number }} - target: {{ redis.config.init_location }} - require: - - file_ext: /etc/redis/redis-{{ instance_number }}.conf + - file: /etc/redis/redis-{{ instance_number }}.conf - watch_in: - service: {{ service }} {% endif %} @@ -38,5 +38,5 @@ redis_config_{{ ip }}_{{ port }}: - name: {{ service }} - enable: True - watch: - - file_ext: /etc/redis/redis-server-{{ instance_number }}.conf + - file: /etc/redis/redis-server-{{ instance_number }}.conf {%- endmacro %} diff --git a/salt/dev/users/projects/setup.sls b/salt/dev/users/projects/setup.sls index 521f16f8..67565578 100644 --- a/salt/dev/users/projects/setup.sls +++ b/salt/dev/users/projects/setup.sls @@ -5,7 +5,7 @@ {% for config in project.configs %} {{ username }}_project_{{ project.url }}_config_{{ config.name }}: - file_ext.managed: + file.managed: - name: {{ project.target }}/{{ config.name }} {% if config.contents is defined %} - contents: {{ config.contents | yaml_encode }} diff --git a/salt/server/foreman/init.sls b/salt/server/foreman/init.sls index 9aadc69a..cb2f4636 100644 --- a/salt/server/foreman/init.sls +++ b/salt/server/foreman/init.sls @@ -113,7 +113,7 @@ setup_foreman_{{ query.name }}: {% for override in foreman.overrides %} foreman_override_{{ override.name }}: - file_ext.managed: + file.managed: - name: {{ override.name }} {%- if override.contents is defined %} - contents: {{ override.contents | yaml_encode }} diff --git a/salt/server/kannel/init.sls b/salt/server/kannel/init.sls index 4555c812..e535b8dc 100644 --- a/salt/server/kannel/init.sls +++ b/salt/server/kannel/init.sls @@ -17,7 +17,7 @@ kannel_server: - enable: True - require: - pkg: kannel - file_ext.managed: + file.managed: - name: {{ kannel.conf }} - source: {{ kannel.conf_source }} - context: diff --git a/salt/server/kvm/vfio.sls b/salt/server/kvm/vfio.sls index e277931e..5d396fa0 100644 --- a/salt/server/kvm/vfio.sls +++ b/salt/server/kvm/vfio.sls @@ -11,7 +11,7 @@ grub_d_directory: {% for config in kvm.vfio.configs %} vfio_{{ config.name }}: - file_ext.managed: + file.managed: - name: {{ config.name }} {%- if config.contents is defined %} - contents: {{ config.contents | yaml_encode }} diff --git a/salt/server/salt/api.sls b/salt/server/salt/api.sls index 30fa410e..142b8ee7 100644 --- a/salt/server/salt/api.sls +++ b/salt/server/salt/api.sls @@ -8,7 +8,7 @@ include: {%- for config in salt_installer.api.config %} salt_api_{{ config.name }}: - file_ext.managed: + file.managed: - name: {{ config.name }} - contents: {{ config.contents | yaml_encode }} - template: jinja diff --git a/salt/server/salt/master.sls b/salt/server/salt/master.sls index 964baba0..3787f1c3 100644 --- a/salt/server/salt/master.sls +++ b/salt/server/salt/master.sls @@ -9,7 +9,7 @@ include: {%- for config in salt_installer.master.config|selectattr("initial", "equalto", True)|list %} salt_master_{{ config.name }}: - file_ext.managed: + file.managed: - name: {{ config.name }} - contents: {{ config.contents | yaml_encode }} - template: jinja @@ -44,7 +44,7 @@ salt_master_sync_modules: {%- for config in salt_installer.master.config|selectattr("initial", "equalto", False)|list %} salt_master_{{ config.name }}: - file_ext.managed: + file.managed: - name: {{ config.name }} - contents: {{ config.contents | yaml_encode }} - template: jinja diff --git a/salt/server/salt/ssh.sls b/salt/server/salt/ssh.sls index ebdb56e9..c3238745 100644 --- a/salt/server/salt/ssh.sls +++ b/salt/server/salt/ssh.sls @@ -8,7 +8,7 @@ include: {%- for config in salt_installer.ssh.config %} salt_ssh_{{ config.name }}: - file_ext.managed: + file.managed: - name: {{ config.name }} - contents: {{ config.contents | yaml_encode }} - template: jinja