From 1d814563e491e29954bce56a5fc1a9480e351cbb Mon Sep 17 00:00:00 2001 From: richard Date: Sat, 4 Nov 2017 11:36:32 -0400 Subject: [PATCH] add dkhost05 --- dkswarm.xai-corp.net.yml | 3 ++- inventory.conf | 6 ++++-- roles/docker_swarm_management/tasks/main.yml | 2 +- roles/dockerhost/tasks/install-xenial.yml | 1 + roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dkswarm.xai-corp.net.yml b/dkswarm.xai-corp.net.yml index 8fcd483..187288b 100644 --- a/dkswarm.xai-corp.net.yml +++ b/dkswarm.xai-corp.net.yml @@ -11,12 +11,13 @@ - swarm: managers: - dkhost01 - - dkhost03 + - dkhost05 - home workers: [] removed: - dkhost04 - dkhost02 + - dkhost03 history: 1 diff --git a/inventory.conf b/inventory.conf index ad1a8b6..b1b6be8 100644 --- a/inventory.conf +++ b/inventory.conf @@ -5,16 +5,18 @@ home ansible_ssh_host=192.168.2.11 home02 ansible_ssh_host=192.168.2.22 dkhost01 ansible_ssh_host=192.168.2.41 #dkhost02 ansible_ssh_host=192.168.2.43 -dkhost03 ansible_ssh_host=192.168.2.53 +#dkhost03 ansible_ssh_host=192.168.2.53 #dkhost04 ansible_ssh_host=192.168.2.54 +dkhost05 ansible_ssh_host=192.168.2.55 #logs ansible_ssh_host=192.168.2.42 cubox-i ansible_ssh_host=192.168.2.12 [dkhost] dkhost01 ansible_ssh_host=192.168.2.41 #dkhost02 ansible_ssh_host=192.168.2.43 -dkhost03 ansible_ssh_host=192.168.2.53 +#dkhost03 ansible_ssh_host=192.168.2.53 #dkhost04 ansible_ssh_host=192.168.2.54 +dkhost05 ansible_ssh_host=192.168.2.55 home ansible_ssh_host=192.168.2.11 [ns] diff --git a/roles/docker_swarm_management/tasks/main.yml b/roles/docker_swarm_management/tasks/main.yml index 227f768..5bd9079 100644 --- a/roles/docker_swarm_management/tasks/main.yml +++ b/roles/docker_swarm_management/tasks/main.yml @@ -29,7 +29,7 @@ # add hosts to swarm - name: adding manager to swarm - command: docker swarm join --token={{manager_token.stdout}} + command: docker swarm join --token={{manager_token.stdout}} {{swarm.managers[0]}} args: creates: /var/lib/docker/swarm/state.json when: "ansible_nodename in swarm.managers" diff --git a/roles/dockerhost/tasks/install-xenial.yml b/roles/dockerhost/tasks/install-xenial.yml index 03dcb74..70266c0 100644 --- a/roles/dockerhost/tasks/install-xenial.yml +++ b/roles/dockerhost/tasks/install-xenial.yml @@ -8,6 +8,7 @@ update_cache: yes cache_valid_time: 3600 with_items: + - "htop" - "wget" - "apt-transport-https" - "ca-certificates" diff --git a/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 b/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 index 2e5c53a..7075f0e 100644 --- a/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 +++ b/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 @@ -30,6 +30,7 @@ dkhost01 IN A 192.168.2.41 dkhost02 IN A 192.168.2.43 dkhost03 IN A 192.168.2.53 dkhost04 IN A 192.168.2.54 +dkhost05 IN A 192.168.2.55 ; dns servers ns IN A 192.168.2.22 @@ -44,6 +45,7 @@ dkhost IN A 192.168.2.41 ;dkhost IN A 192.168.2.43 dkhost IN A 192.168.2.53 ;dkhost IN A 192.168.2.54 +;dkhost IN A 192.168.2.55 ; service domains fs IN CNAME dkhost