From f6254f4ab3503fa6d7075313fc3ab4284ab54fdb Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Fri, 19 May 2017 11:41:18 +0200 Subject: [PATCH] TT#16315 Fix influxdb binding check, switch to library get_all_ips_for_host Change-Id: Ie2d67c6a164ea681851a267c91fe3f5fa119646c --- ce/03_open_ports.yaml.tt2 | 8 ++++++-- pro/03_open_ports.yaml.tt2 | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ce/03_open_ports.yaml.tt2 b/ce/03_open_ports.yaml.tt2 index 6b479d4..9662ae5 100644 --- a/ce/03_open_ports.yaml.tt2 +++ b/ce/03_open_ports.yaml.tt2 @@ -9,6 +9,10 @@ PROCESS '/usr/lib/ngcp-ngcpcfg/get_all_ips_for_host'; web_int_ips = out; -%] +[% argv.host=hostname; argv.type='ha_int'; + PROCESS '/usr/lib/ngcp-ngcpcfg/get_all_ips_for_host'; + ha_int_ips = out; +-%] port: tcp:443: listening: true @@ -20,8 +24,8 @@ port: tcp:8083: listening: true - ip: ["[% hosts.$hostname.$host_ha_iface.ip %]"] + ip: ["[% ha_int_ips.0 %]"] tcp:8086: listening: true - ip: ["[% hosts.$hostname.$host_ha_iface.ip %]"] + ip: ["[% ha_int_ips.0 %]"] diff --git a/pro/03_open_ports.yaml.tt2 b/pro/03_open_ports.yaml.tt2 index e4e5bbd..637b1ba 100644 --- a/pro/03_open_ports.yaml.tt2 +++ b/pro/03_open_ports.yaml.tt2 @@ -53,6 +53,10 @@ web_int_ips = out; -%] [% END -%] +[% argv.host=hostname; argv.type='ha_int'; + PROCESS '/usr/lib/ngcp-ngcpcfg/get_all_ips_for_host'; + ha_int_ips = out; +-%] port: @@ -155,7 +159,7 @@ port: [% IF is_rtp || is_proxy || is_db -%] tcp:6379: listening: true - ip: ["[% hosts.$hostname.$host_ha_iface.ip %]"] + ip: ["[% ha_int_ips.0 %]"] [% END -%] tcp:7777: @@ -180,11 +184,11 @@ port: [% END -%] tcp:8083: listening: true - ip: ["[% hosts.$hostname.$host_ha_iface.ip %]"] + ip: ["[% ha_int_ips.0 %]"] tcp:8086: listening: true - ip: ["[% hosts.$hostname.$host_ha_iface.ip %]"] + ip: ["[% ha_int_ips.0 %]"] tcp:9096: listening: true