Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(tofs): use source_files instead of files #2

Merged
merged 1 commit into from
Mar 11, 2019

Conversation

myii
Copy link
Contributor

@myii myii commented Mar 10, 2019


Also involved updating topdir to tplroot.


Testing before and after, using a pillar containing:

  tofs:
    files_switch:
      - any/path/can/be/used/here
      - id
      - osfinger
      - os
      - os_family
    dirs:
      files: files_alt
      default: default_alt
    source_files:
      stack-config:
        - 'sdb.conf'
        - 'sdb_alt.conf'
      stack-keys-config:
        - 'sdb_keys.conf'
        - 'sdb_keys_alt.conf'

Confirmed the same source output:

    - source:
      - salt://stack/files_alt/any/path/can/be/used/here/sdb.conf
      - salt://stack/files_alt/any/path/can/be/used/here/sdb_alt.conf
      - salt://stack/files_alt/ABC/sdb.conf
      - salt://stack/files_alt/ABC/sdb_alt.conf
      - salt://stack/files_alt/Ubuntu-16.04/sdb.conf
      - salt://stack/files_alt/Ubuntu-16.04/sdb_alt.conf
      - salt://stack/files_alt/Ubuntu/sdb.conf
      - salt://stack/files_alt/Ubuntu/sdb_alt.conf
      - salt://stack/files_alt/Debian/sdb.conf
      - salt://stack/files_alt/Debian/sdb_alt.conf
      - salt://stack/files_alt/default_alt/sdb.conf
      - salt://stack/files_alt/default_alt/sdb_alt.conf

    - source:
      - salt://stack/files_alt/any/path/can/be/used/here/sdb_keys.conf
      - salt://stack/files_alt/any/path/can/be/used/here/sdb_keys_alt.conf
      - salt://stack/files_alt/ABC/sdb_keys.conf
      - salt://stack/files_alt/ABC/sdb_keys_alt.conf
      - salt://stack/files_alt/Ubuntu-16.04/sdb_keys.conf
      - salt://stack/files_alt/Ubuntu-16.04/sdb_keys_alt.conf
      - salt://stack/files_alt/Ubuntu/sdb_keys.conf
      - salt://stack/files_alt/Ubuntu/sdb_keys_alt.conf
      - salt://stack/files_alt/Debian/sdb_keys.conf
      - salt://stack/files_alt/Debian/sdb_keys_alt.conf
      - salt://stack/files_alt/default_alt/sdb_keys.conf
      - salt://stack/files_alt/default_alt/sdb_keys_alt.conf

@claudekenni claudekenni merged commit 06fc330 into claudekenni:master Mar 11, 2019
@myii myii deleted the bug/remove-dupe-files-in-tofs branch March 11, 2019 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants