diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index e6107c494..378b72a24 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -92,7 +92,7 @@ so-mysql: - {{ BINDING }} {% endfor %} - extra_hosts: - - {{ GLOBALS.manager }}:{{ GLOBALS.sobip }} + - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }} - environment: - MYSQL_ROOT_HOST={{ GLOBALS.manager_ip }} - MYSQL_ROOT_PASSWORD=/etc/mypass diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja index 52951c7d6..6460e8957 100644 --- a/salt/vars/globals.map.jinja +++ b/salt/vars/globals.map.jinja @@ -1,4 +1,5 @@ {% 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' #} @@ -21,7 +22,8 @@ 'md_engine': INIT.PILLAR.global.mdengine, 'pipeline': INIT.PILLAR.global.pipeline, '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, 'so_model': INIT.GRAINS.get('sosmodel',''), 'description': INIT.PILLAR.sensoroni.get('node_description',''),