update sslproxy to use dns instead of ip

roles/bootstrap_vms/templates/Vagrantfile.j2

@@ -47,21 +47,21 @@ Vagrant.configure("2") do |config|
 
   end
 
-  config.vm.define "dkhost03" do |dkhost03|
+  config.vm.define "dkhost02" do |dkhost|
 
-    dkhost03.vm.hostname = "dkhost03"
+    dkhost.vm.hostname = "dkhost02"
 
-    dkhost03.vm.box = BASE_BOX
-    dkhost03.vm.box_check_update = true
+    dkhost.vm.box = BASE_BOX
+    dkhost.vm.box_check_update = true
 
-    dkhost03.vm.network "public_network", bridge: BRIDGE_NET
+    dkhost.vm.network "public_network", bridge: BRIDGE_NET
 
-    dkhost03.vm.synced_folder '.', '/vagrant', disabled: true
+    dkhost.vm.synced_folder '.', '/vagrant', disabled: true
 
-    dkhost03.vm.provision "shell", inline: $script
+    dkhost.vm.provision "shell", inline: $script
 
-    dkhost03.vm.provider "virtualbox" do |vb|
-      vb.name = "dkhost03"
+    dkhost.vm.provider "virtualbox" do |vb|
+      vb.name = "dkhost01"
       vb.gui = false
       vb.memory = "2048"
       vb.cpus = 2
@@ -69,35 +69,9 @@ Vagrant.configure("2") do |config|
       #vb.customize ["modifyvm", :id, "--autostart-enabled", "on"]
       #vb.customize ["modifyvm", :id, "--autostart-delay", "30"]
 
-      vb.customize ["modifyvm", :id, "--macaddress2", "08002794035A"]
+      vb.customize ["modifyvm", :id, "--macaddress2", "0800273D10E4"]
     end
 
   end
 
-  config.vm.define "dkhost04" do |dkhost04|
-
-    dkhost04.vm.hostname = "dkhost04"
-
-    dkhost04.vm.box = BASE_BOX
-    dkhost04.vm.box_check_update = true
-
-    dkhost04.vm.network "public_network", bridge: BRIDGE_NET
-
-    dkhost04.vm.synced_folder '.', '/vagrant', disabled: true
-
-    dkhost04.vm.provision "shell", inline: $script
-
-    dkhost04.vm.provider "virtualbox" do |vb|
-      vb.name = "dkhost04"
-      vb.gui = false
-      vb.memory = "2048"
-      vb.cpus = 2
-
-      #vb.customize ["modifyvm", :id, "--autostart-enabled", "on"]
-      #vb.customize ["modifyvm", :id, "--autostart-delay", "30"]
-
-      vb.customize ["modifyvm", :id, "--macaddress2", "080027FD5A0E"]
-    end
-
-  end
 end

roles/docker_swarm_management/tasks/main.yml

@@ -0,0 +1,65 @@
+---
+# tasks for managing docker a swarm
+
+
+# init swarm
+- name: run init on a host
+  command: docker swarm init
+  args:
+    creates: /var/lib/docker/swarm/state.json
+  when: "ansible_nodename in swarm.managers"
+  run_once: true
+
+# get tokens
+- name: get manager_token
+  command: docker swarm join-token manager -q
+  register: manager_token
+  when: "ansible_nodename in swarm.managers"
+  run_once: true
+  changed_when: False
+
+- name: get worker_token
+  command: docker swarm join-token worker -q
+  register: worker_token
+  when: "ansible_nodename in swarm.managers"
+  run_once: true
+  changed_when: False
+
+#- debug: var=manager_token
+
+# add hosts to swarm
+- name: adding manager to swarm
+  command: docker swarm join --token={{manager_token.stdout}}
+  args:
+    creates: /var/lib/docker/swarm/state.json
+  when: "ansible_nodename in swarm.managers"
+
+- name: adding worker to swarm
+  command: docker swarm join --token={{worker_token.stdout}} {{swarm.managers[0]}}:2376
+  args:
+    creates: /var/lib/docker/swarm/state.json
+  when: "ansible_nodename in swarm.workers"
+
+# remove hosts from swarm
+- name: remove hosts from swam if found in remove list
+  command: docker swarm remove
+  args:
+    removes: /var/lib/docker/swarm/state.json
+  when: "ansible_nodename in swarm.removed"
+
+# swarm config
+- name: get history limit
+  command: docker info --format '{% raw %}{{json .Swarm.Cluster.Spec.Orchestration.TaskHistoryRetentionLimit}}{% endraw %}'
+  register: history_limit
+  run_once: true
+  changed_when: False
+
+- debug: var=history_limit.stdout
+  run_once: True
+
+- name: set history limit
+  command: docker swarm update --task-history-limit {{swarm.history}}
+  when:
+    - "ansible_nodename in swarm.managers"
+    - 'swarm.history != history_limit.stdout|int'
+  run_once: true

roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2

@@ -30,7 +30,7 @@ gluster                 IN A    192.168.2.12
 home02                  IN A    192.168.2.22
 
 dkhost                  IN A    192.168.2.41
-dkhost                  IN A    192.168.2.43
+;dkhost                  IN A    192.168.2.43
 dkhost                  IN A    192.168.2.53
 dkhost                  IN A    192.168.2.54
 
@@ -39,11 +39,11 @@ sql                     IN A    192.168.2.41
 tripbuilder             IN A    192.168.2.41
 
 dkhost02                IN A    192.168.2.43
-fs                      IN A    192.168.2.43
-git                     IN A    192.168.2.43
-dkui                    IN A    192.168.2.43
-jenkins                 IN A    192.168.2.43
-logs                    IN A    192.168.2.43
+fs                      IN CNAME    dkhost
+git                     IN CNAME    dkhost
+dkui                    IN CNAME    dkhost
+jenkins                 IN CNAME    dkhost
+logs                    IN CNAME    dkhost
 dkregistry              IN CNAME    dkhost
 
 dkhost03                IN A    192.168.2.53