diff --git a/README.rst b/README.rst index 1842d37..a11efc5 100644 --- a/README.rst +++ b/README.rst @@ -136,8 +136,9 @@ the minions. cd hubblestack-pulsar.git mkdir -p /srv/salt/_beacons/ cp _beacons/pulsar.py /srv/salt/_beacons/ - cp hubblestack_pulsar_config.yaml /srv/salt/ - cp pillar.example /srv/pillar/hubblestack_pulsar.sls + mkdir /srv/salt/hubblestack_pulsar + cp hubblestack_pulsar/hubblestack_pulsar_config.yaml /srv/salt/hubblestack_pulsar + cp hubblestack_pulsar/pillar.example /srv/pillar/hubblestack_pulsar.sls salt \* saltutil.sync_beacons Target the copied ``hubblestack_pulsar.sls`` to selected minions. @@ -177,13 +178,13 @@ Pulsar to be flexible. beacons: pulsar: paths: - - /var/cache/salt/minion/files/base/hubblestack_pulsar_config.yaml + - /var/cache/salt/minion/files/base/hubblestack_pulsar/hubblestack_pulsar_config.yaml schedule: cache_nebula: function: cp.cache_file seconds: 86400 args: - - salt://hubblestack_pulsar_config.yaml + - salt://hubblestack_pulsar/hubblestack_pulsar_config.yaml return_job: False diff --git a/_beacons/pulsar.py b/_beacons/pulsar.py index dd9d1aa..a22f6eb 100644 --- a/_beacons/pulsar.py +++ b/_beacons/pulsar.py @@ -87,7 +87,7 @@ def beacon(config): beacons: pulsar: paths: - - /var/cache/salt/minion/files/base/hubblestack_pulsar_config.yaml + - /var/cache/salt/minion/files/base/hubblestack_pulsar/hubblestack_pulsar_config.yaml refresh_frequency: 60 verbose: False diff --git a/hubblestack_pulsar_config.yaml b/hubblestack_pulsar/hubblestack_pulsar_config.yaml similarity index 100% rename from hubblestack_pulsar_config.yaml rename to hubblestack_pulsar/hubblestack_pulsar_config.yaml diff --git a/pillar.example b/hubblestack_pulsar/pillar.example similarity index 52% rename from pillar.example rename to hubblestack_pulsar/pillar.example index bcd1476..9b893f6 100644 --- a/pillar.example +++ b/hubblestack_pulsar/pillar.example @@ -1,7 +1,7 @@ beacons: pulsar: paths: - - /var/cache/salt/minion/files/base/hubblestack_pulsar_config.yaml + - /var/cache/salt/minion/files/base/hubblestack_pulsar/hubblestack_pulsar_config.yaml disable_during_state_run: True schedule: @@ -9,5 +9,5 @@ schedule: function: cp.cache_file seconds: 86400 args: - - salt://hubblestack_pulsar_config.yaml + - salt://hubblestack_pulsar/hubblestack_pulsar_config.yaml return_job: False diff --git a/win_pillar.example b/hubblestack_pulsar/win_pillar.example similarity index 100% rename from win_pillar.example rename to hubblestack_pulsar/win_pillar.example