search

saltstack-formulas / zabbix-formula

http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html
Other
50 stars 121 forks source link

refactor(tofs): upgrade for all file.managed #132

Closed myii closed 4 years ago

myii commented 4 years ago

The formula is still using the original version of TOFS, which has been significantly upgraded. It's effectively a drop-in replacement, only needing the unnecessary first prefix to be removed from each files_switch call. I've produced the debug output before and after this PR, with the diff being minimal.

--- https://travis-ci.org/myii/zabbix-formula/jobs/597115539
+++ https://travis-ci.org/myii/zabbix-formula/jobs/597128097
@@ -1,96 +1,89 @@
        /etc/zabbix/zabbix_agentd.conf:
          file.managed:
            - source: 
-         
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/zabbix_agentd.conf
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/zabbix_agentd.conf.jinja
              - salt://zabbix/files/Debian/etc/zabbix/zabbix_agentd.conf
              - salt://zabbix/files/Debian/etc/zabbix/zabbix_agentd.conf.jinja
              - salt://zabbix/files/default/etc/zabbix/zabbix_agentd.conf
              - salt://zabbix/files/default/etc/zabbix/zabbix_agentd.conf.jinja
 ---
        [DEBUG   ] Rendered data from file: /tmp/kitchen/var/cache/salt/minion/files/base/zabbix/pgsql/schema.sls:
        upload_sql_dump:
          file.managed:
            - makedirs: True
            - source: 
-         
              - salt://zabbix/files/14fa156a7c45/usr/share/doc/zabbix-server-pgsql/custom.sql.gz
              - salt://zabbix/files/Debian/usr/share/doc/zabbix-server-pgsql/custom.sql.gz
              - salt://zabbix/files/default/usr/share/doc/zabbix-server-pgsql/custom.sql.gz
 ---
        /etc/zabbix/web/zabbix.conf.php:
          file.managed:
            - source: 
-         
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/web/zabbix.conf.php
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/web/zabbix.conf.php.jinja
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/web/zabbix.conf.php
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/web/zabbix.conf.php.jinja
              - salt://zabbix/files/Debian/etc/zabbix/web/zabbix.conf.php
              - salt://zabbix/files/Debian/etc/zabbix/web/zabbix.conf.php.jinja
              - salt://zabbix/files/Debian/etc/zabbix/web/zabbix.conf.php
              - salt://zabbix/files/Debian/etc/zabbix/web/zabbix.conf.php.jinja
              - salt://zabbix/files/default/etc/zabbix/web/zabbix.conf.php
              - salt://zabbix/files/default/etc/zabbix/web/zabbix.conf.php.jinja
              - salt://zabbix/files/default/etc/zabbix/web/zabbix.conf.php
              - salt://zabbix/files/default/etc/zabbix/web/zabbix.conf.php.jinja
 ---
        [DEBUG   ] Rendered data from file: /tmp/kitchen/var/cache/salt/minion/files/base/zabbix/mysql/schema.sls:
        /usr/share/zabbix-server-mysql/salt-provided-create-34.sql:
          file.managed:
            - makedirs: True
            - source: 
-         
              - salt://zabbix/files/14fa156a7c45/usr/share/zabbix-server-mysql/salt-provided-create-34.sql
              - salt://zabbix/files/Debian/usr/share/zabbix-server-mysql/salt-provided-create-34.sql
              - salt://zabbix/files/default/usr/share/zabbix-server-mysql/salt-provided-create-34.sql
 ---
        /etc/zabbix/zabbix_proxy.conf:
          file.managed:
            - source: 
-         
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/zabbix_proxy.conf
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/zabbix_proxy.conf.jinja
              - salt://zabbix/files/Debian/etc/zabbix/zabbix_proxy.conf
              - salt://zabbix/files/Debian/etc/zabbix/zabbix_proxy.conf.jinja
              - salt://zabbix/files/default/etc/zabbix/zabbix_proxy.conf
              - salt://zabbix/files/default/etc/zabbix/zabbix_proxy.conf.jinja
 ---
        /etc/zabbix/zabbix_server.conf:
          file.managed:

            - source: 
-         
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/zabbix_server.conf
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/zabbix_server.conf.jinja
              - salt://zabbix/files/Debian/etc/zabbix/zabbix_server.conf
              - salt://zabbix/files/Debian/etc/zabbix/zabbix_server.conf.jinja
              - salt://zabbix/files/default/etc/zabbix/zabbix_server.conf
              - salt://zabbix/files/default/etc/zabbix/zabbix_server.conf.jinja
 ---
        /etc/zabbix/zabbix_server.conf:
          file.managed:
            - source: 
-         
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/zabbix_server_22.conf
              - salt://zabbix/files/14fa156a7c45/etc/zabbix/zabbix_server_22.conf.jinja
              - salt://zabbix/files/Debian/etc/zabbix/zabbix_server_22.conf
              - salt://zabbix/files/Debian/etc/zabbix/zabbix_server_22.conf.jinja
              - salt://zabbix/files/default/etc/zabbix/zabbix_server_22.conf
              - salt://zabbix/files/default/etc/zabbix/zabbix_server_22.conf.jinja
saltstack-formulas-travis commented 4 years ago

:tada: This PR is included in version 0.21.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket: