From 68708accde95c73e4319b134a38f9f28cbdf2d9a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 14:32:49 -0500 Subject: [PATCH] change playbook to use hostname --- salt/mysql/init.sls | 2 ++ salt/playbook/init.sls | 4 ++-- salt/vars/globals.map.jinja | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index d6a910f32..e6107c494 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -91,6 +91,8 @@ so-mysql: {% for BINDING in DOCKER.containers['so-mysql'].port_bindings %} - {{ BINDING }} {% endfor %} + - extra_hosts: + - {{ GLOBALS.manager }}:{{ GLOBALS.sobip }} - environment: - MYSQL_ROOT_HOST={{ GLOBALS.manager_ip }} - MYSQL_ROOT_PASSWORD=/etc/mypass diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index 5e3285914..5fe9ab92f 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -36,8 +36,8 @@ query_playbookdbuser_grants: query_updatwebhooks: mysql_query.run: - database: playbook - - query: "update webhooks set url = 'http://{{ GLOBALS.manager}}:7000/playbook/webhook' where project_id = 1" - - connection_host: {{ GLOBALS.manager_ip }} + - query: "update webhooks set url = 'http://{{ GLOBALS.manager_ip}}:7000/playbook/webhook' where project_id = 1" + - connection_host: {{ GLOBALS.manager }} - connection_port: 3306 - connection_user: root - connection_pass: {{ MYSQLPASS }} diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja index b2f5af552..52951c7d6 100644 --- a/salt/vars/globals.map.jinja +++ b/salt/vars/globals.map.jinja @@ -21,6 +21,7 @@ 'md_engine': INIT.PILLAR.global.mdengine, 'pipeline': INIT.PILLAR.global.pipeline, 'so_version': INIT.PILLAR.global.soversion, + 'so_bip': INIT.PILLAR.docker.sobip, 'url_base': INIT.PILLAR.global.url_base, 'so_model': INIT.GRAINS.get('sosmodel',''), 'description': INIT.PILLAR.sensoroni.get('node_description',''),