Use short name as hostname for nodes

drmalex07 · Sep 12, 2017 · dd7dc38 · dd7dc38
1 parent 69aac31
commit dd7dc38
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -31,7 +31,7 @@ Vagrant.configure(2) do |config|
 
       worker.vm.network "private_network", ip: h['ipv4_address']
       worker.vm.provider "virtualbox" do |vb|
-        vb.name = h['hostname']
+        vb.name = h['fqdn']
         vb.memory = 512
       end
     end
@@ -42,7 +42,7 @@ Vagrant.configure(2) do |config|
 
     manager.vm.network "private_network", ip: h['ipv4_address']
     manager.vm.provider "virtualbox" do |vb|
-      vb.name = h['hostname']
+      vb.name = h['fqdn']
       vb.memory = 1024
     end
 

diff --git a/hosts.conf.example b/hosts.conf.example
@@ -6,9 +6,9 @@
 network=10.0.4.0/24
 
 [manager]
-manager ansible_host=manager-s1.internal hostname=manager-s1 ipv4_address=10.0.4.40
+manager ansible_host=manager-s1.internal hostname=manager-s1 ipv4_address=10.0.4.40 fqdn=manager-s1.internal
 
 [workers]
-worker-1 ansible_host=worker-n1-s1.internal hostname=worker-n1-s1 ipv4_address=10.0.4.41
-worker-2 ansible_host=worker-n2-s1.internal hostname=worker-n2-s1 ipv4_address=10.0.4.42
+worker-1 ansible_host=worker-n1-s1.internal hostname=worker-n1-s1 ipv4_address=10.0.4.41 fqdn=worker-n1-s1.internal
+worker-2 ansible_host=worker-n2-s1.internal hostname=worker-n2-s1 ipv4_address=10.0.4.42 fqdn=worker-n2-s1.internal
 
diff --git a/hosts.yml.example b/hosts.yml.example
@@ -10,16 +10,21 @@ all:
       hosts:
         'manager':
           ansible_host: manager-s1.internal
-          hostname: manager-s1.internal
+          fqdn: manager-s1.internal
+          hostname: manager-s1
           ipv4_address: '10.0.4.40'
 
     'workers':
       hosts:
+
         'worker-1':
           ansible_host: worker-n1-s1.internal
-          hostname: worker-n1-s1.internal
+          fqdn: worker-n1-s1.internal
+          hostname: worker-n1-s1
           ipv4_address: '10.0.4.41'
+
         'worker-2':
           ansible_host: worker-n2-s1.internal
-          hostname: worker-n2-s1.internal
+          fqdn: worker-n2-s1.internal
+          hostname: worker-n2-s1
           ipv4_address: '10.0.4.42'
diff --git a/play.yml b/play.yml
@@ -28,9 +28,6 @@
     set_fact:
       hostname: '{{ansible_host}}'
     when: not (hostname is defined)
-
-  - set_fact:
-      hostname_s: '{{hostname.split(".") | first}}'
 
   vars: