add sobip to global vars

This commit is contained in:
m0duspwnens
2023-02-22 14:41:14 -05:00
parent 68708accde
commit bf8e6c64d6
2 changed files with 4 additions and 2 deletions

View File

@@ -92,7 +92,7 @@ so-mysql:
- {{ BINDING }} - {{ BINDING }}
{% endfor %} {% endfor %}
- extra_hosts: - extra_hosts:
- {{ GLOBALS.manager }}:{{ GLOBALS.sobip }} - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }}
- environment: - environment:
- MYSQL_ROOT_HOST={{ GLOBALS.manager_ip }} - MYSQL_ROOT_HOST={{ GLOBALS.manager_ip }}
- MYSQL_ROOT_PASSWORD=/etc/mypass - MYSQL_ROOT_PASSWORD=/etc/mypass

View File

@@ -1,4 +1,5 @@
{% import 'vars/init.map.jinja' as INIT %} {% import 'vars/init.map.jinja' as INIT %}
{% from 'docker/docker.map.jinja' import DOCKER %}
{% from 'vars/' ~ INIT.GRAINS.role.split('-')[1] ~ '.map.jinja' import ROLE_GLOBALS %} {# role is so-role so we have to split off the 'so' #} {% from 'vars/' ~ INIT.GRAINS.role.split('-')[1] ~ '.map.jinja' import ROLE_GLOBALS %} {# role is so-role so we have to split off the 'so' #}
@@ -21,7 +22,8 @@
'md_engine': INIT.PILLAR.global.mdengine, 'md_engine': INIT.PILLAR.global.mdengine,
'pipeline': INIT.PILLAR.global.pipeline, 'pipeline': INIT.PILLAR.global.pipeline,
'so_version': INIT.PILLAR.global.soversion, 'so_version': INIT.PILLAR.global.soversion,
'so_bip': INIT.PILLAR.docker.sobip, 'so_docker_bip': DOCKER.sobip,
'so_docker_range': DOCKER.sorange,
'url_base': INIT.PILLAR.global.url_base, 'url_base': INIT.PILLAR.global.url_base,
'so_model': INIT.GRAINS.get('sosmodel',''), 'so_model': INIT.GRAINS.get('sosmodel',''),
'description': INIT.PILLAR.sensoroni.get('node_description',''), 'description': INIT.PILLAR.sensoroni.get('node_description',''),