Merge pull request #8 from rembik/master

On-Premises: added possibility to use other device names for existing network interface

docs/INSTALL_ONPREM.md

@@ -35,7 +35,7 @@ all:
         1.0.0.5:
   vars:
     # Choose the IP Detect Script
-    # options: eth0, eth1, aws, gcp, azure
+    # options: aws, gcp, azure or eth0, eth1, ... (or other device name for existing network interface)
     ip_detect: eth0
 
     # (internal/private) IP Address of the Bootstrap Node

hosts.example.yaml

@@ -21,7 +21,7 @@ all:
         1.0.0.5:
   vars:
     # Choose the IP Detect Script
-    # options: eth0, eth1, aws, gcp, azure
+    # options: aws, gcp, azure or eth0, eth1, ... (or other device name for existing network interface)
     ip_detect: eth0
 
     # (internal/private) IP Address of the Bootstrap Node

roles/bootstrap/tasks/main.yml

@@ -67,13 +67,9 @@
   copy: src=fault-domain-detect dest={{ path_bootstrap }}/genconf/fault-domain-detect mode=0644
   when: ip_detect == "azure"
 
-- name: set IP detection script for eth0
-  template: src=ip-detect-eth0.j2 dest={{ path_bootstrap }}/genconf/ip-detect mode=0644
-  when: ip_detect == "eth0"
-
-- name: set IP detection script for eth1
-  template: src=ip-detect-eth1.j2 dest={{ path_bootstrap }}/genconf/ip-detect mode=0644
-  when: ip_detect == "eth1"
+- name: set IP detection script for existing network interface
+  template: src=ip-detect-interface.j2 dest={{ path_bootstrap }}/genconf/ip-detect mode=0644
+  when: ip_detect != "aws" and ip_detect != "gcp" and ip_detect != "azure"
 
 - name: generate DC/OS configuration with exhibitor backend static
   template: src=config-static.yaml.j2 dest={{ path_bootstrap }}/genconf/config.yaml mode=0644

roles/bootstrap/templates/ip-detect-interface.j2

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -o nounset -o errexit
+export PATH=/usr/sbin:/usr/bin:$PATH
+echo $(ip addr show {{ ip_detect }} | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)