unfix playbook fix

This commit is contained in:
Mike Reeves
2023-02-24 09:55:49 -05:00
parent 663af7935b
commit 1289500e03
7 changed files with 13 additions and 7 deletions

View File

@@ -56,7 +56,7 @@ docker:
'so-playbook':
final_octet: 32
port_bindings:
- 0.0.0.0:3200:3000
- 0.0.0.0:3000:3000
'so-redis':
final_octet: 33
port_bindings:

View File

@@ -50,7 +50,7 @@ firewall:
- 443
playbook:
tcp:
- 3200
- 3000
redis:
tcp:
- 6379

View File

@@ -7,7 +7,7 @@ include:
wait_for_playbook:
cmd.run:
- name: until nc -z {{ GLOBALS.manager }} 3200; do sleep 1; done
- name: until nc -z {{ GLOBALS.manager }} 3000; do sleep 1; done
- timeout: 300
create_user:

View File

@@ -13,7 +13,7 @@ while [[ $try_count -le 6 ]]; do
# Create user and retrieve api_key and user_id from response
mapfile -t automation_res < <(
curl -s --location --request POST 'http://127.0.0.1:3200/playbook/users.json' --user "admin:{{ admin_pass }}" --header 'Content-Type: application/json' --data '{
curl -s --location --request POST 'http://127.0.0.1:3000/playbook/users.json' --user "admin:{{ admin_pass }}" --header 'Content-Type: application/json' --data '{
"user" : {
"login" : "automation",
"password": "{{ automation_pass }}",
@@ -28,7 +28,7 @@ while [[ $try_count -le 6 ]]; do
automation_user_id=${automation_res[1]}
# Add user_id from newly created user to Automation group
curl -s --location --request POST "http://127.0.0.1:3200/playbook/groups/${automation_group}/users.json" \
curl -s --location --request POST "http://127.0.0.1:3000/playbook/groups/${automation_group}/users.json" \
--user "admin:{{ admin_pass }}" \
--header 'Content-Type: application/json' \
--data "{

View File

@@ -63,10 +63,10 @@ slack_url = YOURSLACKWORKSPACE
slack_webhook = YOURSLACKWEBHOOK
[soc]
soc_url = http://{{ GLOBALS.manager_ip }}:9822
soc_url = http://{{ GLOBALS.manager }}:9822
[playbook]
playbook_url = http://{{ GLOBALS.manager_ip }}:3200/playbook
playbook_url = http://{{ GLOBALS.manager }}:3000/playbook
playbook_ext_url = https://{{ GLOBALS.url_base }}/playbook
playbook_key = {{ PLAYBOOK_KEY }}
playbook_verifycert = no

View File

@@ -81,6 +81,7 @@ so-soctopus:
{% endfor %}
- extra_hosts:
- {{GLOBALS.url_base}}:{{GLOBALS.manager_ip}}
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
- require:
- file: soctopusconf
- file: navigatordefaultlayer

View File

@@ -172,6 +172,7 @@ strelka_coordinator:
- sobridge:
- ipv4_address: {{ DOCKER.containers['so-strelka-coordinator'].ip }}
- entrypoint: redis-server --save "" --appendonly no
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
- port_bindings:
{% for BINDING in DOCKER.containers['so-strelka-coordinator'].port_bindings %}
- {{ BINDING }}
@@ -190,6 +191,7 @@ strelka_gatekeeper:
- sobridge:
- ipv4_address: {{ DOCKER.containers['so-strelka-gatekeeper'].ip }}
- entrypoint: redis-server --save "" --appendonly no --maxmemory-policy allkeys-lru
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
- port_bindings:
{% for BINDING in DOCKER.containers['so-strelka-gatekeeper'].port_bindings %}
- {{ BINDING }}
@@ -212,6 +214,7 @@ strelka_frontend:
- sobridge:
- ipv4_address: {{ DOCKER.containers['so-strelka-frontend'].ip }}
- command: strelka-frontend
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
- port_bindings:
{% for BINDING in DOCKER.containers['so-strelka-frontend'].port_bindings %}
- {{ BINDING }}
@@ -250,6 +253,7 @@ strelka_manager:
- sobridge:
- ipv4_address: {{ DOCKER.containers['so-strelka-manager'].ip }}
- command: strelka-manager
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
append_so-strelka-manager_so-status.conf:
file.append:
@@ -267,6 +271,7 @@ strelka_filestream:
- sobridge:
- ipv4_address: {{ DOCKER.containers['so-strelka-filestream'].ip }}
- command: strelka-filestream
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
append_so-strelka-filestream_so-status.conf:
file.append: