Merge branch 'dev' into feature/script-fixes

This commit is contained in:
William Wernert
2020-01-23 17:11:45 -05:00
3 changed files with 6 additions and 9 deletions

View File

@@ -85,8 +85,6 @@ so-thehive-es:
# Install Cortex
so-cortex:
docker_container.running:
- require:
- so-corteximage
- image: {{ MASTER }}:5000/soshybridhunter/so-thehive-cortex:HH{{ VERSION }}
- hostname: so-cortex
- name: so-cortex
@@ -104,8 +102,6 @@ cortexscript:
so-thehive:
docker_container.running:
- require:
- so-thehiveimage
- image: {{ MASTER }}:5000/soshybridhunter/so-thehive:HH{{ VERSION }}
- environment:
- ELASTICSEARCH_HOST={{ MASTERIP }}