Merge pull request #37 from HubbleStack/develop

Merge to master (prep for v2016.9.4)
hubblestack · Sep 15, 2016 · ed37e85 · ed37e85
2 parents 5eb842c + e5047df
commit ed37e85
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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 → ...ack_pulsar/hubblestack_pulsar_config.yaml b/hubblestack_pulsar_config.yaml → ...ack_pulsar/hubblestack_pulsar_config.yaml
diff --git a/pillar.example → hubblestack_pulsar/pillar.example b/pillar.example → hubblestack_pulsar/pillar.example
@@ -1,13 +1,13 @@
 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:
   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/win_pillar.example → hubblestack_pulsar/win_pillar.example b/win_pillar.example → hubblestack_pulsar/win_pillar.example