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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Mar 10, 2019
Merged

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

merged 2 commits into from
Mar 10, 2019

Conversation

myii
Copy link
Member

@myii myii commented Mar 9, 2019 •
edited
Loading

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_familly
    dirs:
      files: files_alt
      default: default_alt
    source_files:
      networkd:
        - 'network_alt'
      resolved:
        - 'resolved_alt.conf'
      timesyncd:
        - 'timesyncd_alt.conf'

Confirmed the same source output:

    - source:
      - salt://systemd/files_alt/any/path/can/be/used/here/network_alt
      - salt://systemd/files_alt/ABC/network_alt
      - salt://systemd/files_alt/Ubuntu-16.04/network_alt
      - salt://systemd/files_alt/Ubuntu/network_alt
      - salt://systemd/files_alt/os_familly/network_alt
      - salt://systemd/files_alt/default_alt/network_alt
      - salt://systemd/networkd/files_alt/any/path/can/be/used/here/network_alt
      - salt://systemd/networkd/files_alt/ABC/network_alt
      - salt://systemd/networkd/files_alt/Ubuntu-16.04/network_alt
      - salt://systemd/networkd/files_alt/Ubuntu/network_alt
      - salt://systemd/networkd/files_alt/os_familly/network_alt
      - salt://systemd/networkd/files_alt/default_alt/network_alt
      - salt://systemd/resolved/files_alt/any/path/can/be/used/here/network_alt
      - salt://systemd/resolved/files_alt/ABC/network_alt
      - salt://systemd/resolved/files_alt/Ubuntu-16.04/network_alt
      - salt://systemd/resolved/files_alt/Ubuntu/network_alt
      - salt://systemd/resolved/files_alt/os_familly/network_alt
      - salt://systemd/resolved/files_alt/default_alt/network_alt
      - salt://systemd/timesyncd/files_alt/any/path/can/be/used/here/network_alt
      - salt://systemd/timesyncd/files_alt/ABC/network_alt
      - salt://systemd/timesyncd/files_alt/Ubuntu-16.04/network_alt
      - salt://systemd/timesyncd/files_alt/Ubuntu/network_alt
      - salt://systemd/timesyncd/files_alt/os_familly/network_alt
      - salt://systemd/timesyncd/files_alt/default_alt/network_alt

    - source:
      - salt://systemd/files_alt/any/path/can/be/used/here/resolved_alt.conf
      - salt://systemd/files_alt/ABC/resolved_alt.conf
      - salt://systemd/files_alt/Ubuntu-16.04/resolved_alt.conf
      - salt://systemd/files_alt/Ubuntu/resolved_alt.conf
      - salt://systemd/files_alt/os_familly/resolved_alt.conf
      - salt://systemd/files_alt/default_alt/resolved_alt.conf
      - salt://systemd/networkd/files_alt/any/path/can/be/used/here/resolved_alt.conf
      - salt://systemd/networkd/files_alt/ABC/resolved_alt.conf
      - salt://systemd/networkd/files_alt/Ubuntu-16.04/resolved_alt.conf
      - salt://systemd/networkd/files_alt/Ubuntu/resolved_alt.conf
      - salt://systemd/networkd/files_alt/os_familly/resolved_alt.conf
      - salt://systemd/networkd/files_alt/default_alt/resolved_alt.conf
      - salt://systemd/resolved/files_alt/any/path/can/be/used/here/resolved_alt.conf
      - salt://systemd/resolved/files_alt/ABC/resolved_alt.conf
      - salt://systemd/resolved/files_alt/Ubuntu-16.04/resolved_alt.conf
      - salt://systemd/resolved/files_alt/Ubuntu/resolved_alt.conf
      - salt://systemd/resolved/files_alt/os_familly/resolved_alt.conf
      - salt://systemd/resolved/files_alt/default_alt/resolved_alt.conf
      - salt://systemd/timesyncd/files_alt/any/path/can/be/used/here/resolved_alt.conf
      - salt://systemd/timesyncd/files_alt/ABC/resolved_alt.conf
      - salt://systemd/timesyncd/files_alt/Ubuntu-16.04/resolved_alt.conf
      - salt://systemd/timesyncd/files_alt/Ubuntu/resolved_alt.conf
      - salt://systemd/timesyncd/files_alt/os_familly/resolved_alt.conf
      - salt://systemd/timesyncd/files_alt/default_alt/resolved_alt.conf

    - source:
      - salt://systemd/files_alt/any/path/can/be/used/here/timesyncd_alt.conf
      - salt://systemd/files_alt/ABC/timesyncd_alt.conf
      - salt://systemd/files_alt/Ubuntu-16.04/timesyncd_alt.conf
      - salt://systemd/files_alt/Ubuntu/timesyncd_alt.conf
      - salt://systemd/files_alt/os_familly/timesyncd_alt.conf
      - salt://systemd/files_alt/default_alt/timesyncd_alt.conf
      - salt://systemd/networkd/files_alt/any/path/can/be/used/here/timesyncd_alt.conf
      - salt://systemd/networkd/files_alt/ABC/timesyncd_alt.conf
      - salt://systemd/networkd/files_alt/Ubuntu-16.04/timesyncd_alt.conf
      - salt://systemd/networkd/files_alt/Ubuntu/timesyncd_alt.conf
      - salt://systemd/networkd/files_alt/os_familly/timesyncd_alt.conf
      - salt://systemd/networkd/files_alt/default_alt/timesyncd_alt.conf
      - salt://systemd/resolved/files_alt/any/path/can/be/used/here/timesyncd_alt.conf
      - salt://systemd/resolved/files_alt/ABC/timesyncd_alt.conf
      - salt://systemd/resolved/files_alt/Ubuntu-16.04/timesyncd_alt.conf
      - salt://systemd/resolved/files_alt/Ubuntu/timesyncd_alt.conf
      - salt://systemd/resolved/files_alt/os_familly/timesyncd_alt.conf
      - salt://systemd/resolved/files_alt/default_alt/timesyncd_alt.conf
      - salt://systemd/timesyncd/files_alt/any/path/can/be/used/here/timesyncd_alt.conf
      - salt://systemd/timesyncd/files_alt/ABC/timesyncd_alt.conf
      - salt://systemd/timesyncd/files_alt/Ubuntu-16.04/timesyncd_alt.conf
      - salt://systemd/timesyncd/files_alt/Ubuntu/timesyncd_alt.conf
      - salt://systemd/timesyncd/files_alt/os_familly/timesyncd_alt.conf
      - salt://systemd/timesyncd/files_alt/default_alt/timesyncd_alt.conf

@myii myii requested a review from aboe76 March 9, 2019 22:46
@myii
Copy link
Member Author

myii commented Mar 9, 2019

@aboe76 Just noticed os_familly in the output above and found that was because of pillar.example having a typo. Have updated that and added that commit here, too.

@aboe76
Copy link
Member

aboe76 commented Mar 10, 2019

@myii thanks for fixing my typo.

@aboe76 aboe76 merged commit c9e712e into saltstack-formulas:master Mar 10, 2019
@myii myii deleted the bug/remove-dupe-files-in-tofs branch March 10, 2019 00:02
@myii
Copy link
Member Author

myii commented Mar 10, 2019

@aboe76 No problem, you're welcome.

@myii myii mentioned this pull request Mar 19, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aboe76 aboe76 Awaiting requested review from aboe76

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@myii @aboe76