diff --git a/salt/idh/init.sls b/salt/idh/init.sls index 52c707fa4..20a6412ce 100644 --- a/salt/idh/init.sls +++ b/salt/idh/init.sls @@ -24,14 +24,14 @@ include: {% else %} {% set proto = 'tcp' %} {% endif %} -block_mgt_ip_idh_services_{{ proto }}_{{ OPENCANARYCONFIG[service~'.port'] }} : +block_mgt_ip_idh_services_{{ proto }}_{{ OPENCANARYCONFIG[service~'_x_port'] }} : iptables.insert: - table: filter - chain: INPUT - jump: DROP - position: 1 - proto: {{ proto }} - - dport: {{ OPENCANARYCONFIG[service~'.port'] }} + - dport: {{ OPENCANARYCONFIG[service~'_x_port'] }} - destination: {{ GLOBALS.node_ip }} {% endfor %} {% endif %} diff --git a/setup/so-functions b/setup/so-functions index 807d29575..c58760059 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1311,18 +1311,6 @@ import_registry_docker() { idh_pillar() { touch $adv_idh_pillar_file - title "Create the IDH Pillar" - printf '%s\n'\ - "idh:"\ - " listen_on_mgnt_int: True"\ - " services:"\ - " - HTTP"\ - " - FTP"\ - " - MYSQL"\ - " - MSSQL"\ - " - VNC"\ - " - SSH" > "$idh_pillar_file" - } logstash_pillar() { diff --git a/setup/so-setup b/setup/so-setup index 88a2fd045..06c156305 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -475,7 +475,7 @@ if ! [[ -f $install_opt_file ]]; then collect_mngr_hostname add_mngr_ip_to_hosts check_manager_connection - collect_idh_services + #collect_idh_services (this may be added back sometime in the future) collect_idh_preferences set_minion_info whiptail_end_settings