From d817d13607c53427cff49a819af698b7be2a19c8 Mon Sep 17 00:00:00 2001 From: richard Date: Sat, 3 Feb 2018 09:02:45 -0500 Subject: [PATCH] add service scripts --- dkswarm.xai-corp.net.yml | 4 +- dockerfiles/services/build_apps.sh | 9 +++ dockerfiles/services/gitea/docker-compose.yml | 17 ++++- dockerfiles/services/launch_apps.sh | 13 ++++ .../nextcloud/docker-compose-prod.yml | 63 ++++++++++++------- .../services/nextcloud/docker-compose.yml | 20 +++--- .../services/services/build_services.sh | 7 +++ .../services/{dd-agent => datadog}/.env | 0 .../services/datadog/docker-compose.yml | 44 +++++++++++++ .../services/dd-agent/docker-compose.yml | 38 ----------- .../dkregistry/docker-compose.yml | 20 +++++- .../services/services/fluentd/Dockerfile | 1 - .../services/fluentd/docker-compose-prod.yml | 38 +++++++++++ .../services/fluentd/docker-compose.yml | 17 +---- .../services/services/launch_services.sh | 28 +++++++++ .../services/mariadb/docker-compose.yml | 15 +++-- .../services/memcached/docker-compose.yml | 36 ++++++----- dockerfiles/services/services/network.yml | 15 +++++ .../services/postgres/docker-compose.yml | 19 ++++-- .../services/redis/docker-compose.yml | 13 ++-- .../services/sslproxy/docker-compose-prod.yml | 42 ++++++------- .../sslproxy/hosts/abcapi.xai-corp.net.conf | 7 ++- dockerfiles/services/ui/docker-compose.yml | 21 ++++++- inventory.conf | 10 +-- .../templates/xai-corp.net.internal.j2 | 16 +++-- scripts/reboot.sh | 5 ++ 26 files changed, 360 insertions(+), 158 deletions(-) create mode 100644 dockerfiles/services/build_apps.sh create mode 100644 dockerfiles/services/launch_apps.sh create mode 100644 dockerfiles/services/services/build_services.sh rename dockerfiles/services/services/{dd-agent => datadog}/.env (100%) create mode 100644 dockerfiles/services/services/datadog/docker-compose.yml delete mode 100644 dockerfiles/services/services/dd-agent/docker-compose.yml rename dockerfiles/services/{ => services}/dkregistry/docker-compose.yml (84%) create mode 100644 dockerfiles/services/services/fluentd/docker-compose-prod.yml create mode 100755 dockerfiles/services/services/launch_services.sh create mode 100644 dockerfiles/services/services/network.yml create mode 100644 scripts/reboot.sh diff --git a/dkswarm.xai-corp.net.yml b/dkswarm.xai-corp.net.yml index fb5ad42..c26ca1e 100644 --- a/dkswarm.xai-corp.net.yml +++ b/dkswarm.xai-corp.net.yml @@ -11,12 +11,12 @@ - swarm: managers: - dkhost01 - - dkhost03 + - dkhost02 - home workers: [] removed: + - dkhost03 - dkhost04 - - dkhost02 - dkhost05 history: 1 diff --git a/dockerfiles/services/build_apps.sh b/dockerfiles/services/build_apps.sh new file mode 100644 index 0000000..ec35f07 --- /dev/null +++ b/dockerfiles/services/build_apps.sh @@ -0,0 +1,9 @@ +#!/bin/bash -ex + +docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY + +(cd nextcloud && docker-compose -f docker-compose.yml build) +(cd sslproxy && docker-compose -f docker-compose.yml build) + +docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest +docker push dkregistry.xai-corp.net:5000/sslproxy:2.1 diff --git a/dockerfiles/services/gitea/docker-compose.yml b/dockerfiles/services/gitea/docker-compose.yml index 7602ca7..75d26a3 100644 --- a/dockerfiles/services/gitea/docker-compose.yml +++ b/dockerfiles/services/gitea/docker-compose.yml @@ -2,7 +2,7 @@ # DOCKER_HOST=192.168.2.41:2376 docker-compose up -d # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml gitea -version: '3' +version: '3.4' services: app: @@ -20,6 +20,10 @@ services: condition: any delay: "5s" max_attempts: 3 + update_config: + parallelism: 1 + delay: 2s + order: start-first labels: net.xai-corp.sslproxy.description: proxy ssl calls to non ssl containers resources: @@ -33,3 +37,14 @@ services: fluentd-address: "logs.xai-corp.net:24224" fluentd-async-connect: 'true' tag: gitea + +networks: + default: + external: + name: ingress + ingress: + external: + name: ingress + prod: + external: + name: prod diff --git a/dockerfiles/services/launch_apps.sh b/dockerfiles/services/launch_apps.sh new file mode 100644 index 0000000..3409b38 --- /dev/null +++ b/dockerfiles/services/launch_apps.sh @@ -0,0 +1,13 @@ +#!/bin/bash -ex + +export DOCKER_HOST=dkmanager:2376 + +docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY + +docker stack deploy --with-registry-auth --prune -c gitea/docker-compose.yml gitea + +docker stack deploy --with-registry-auth --prune -c nextcloud/docker-compose-prod.yml nextcloud + +docker stack deploy --with-registry-auth --prune -c ui/docker-compose.yml dkui + +docker stack deploy --with-registry-auth --prune -c sslproxy/docker-compose-prod.yml sslproxy diff --git a/dockerfiles/services/nextcloud/docker-compose-prod.yml b/dockerfiles/services/nextcloud/docker-compose-prod.yml index 49800ee..d2a9a7c 100644 --- a/dockerfiles/services/nextcloud/docker-compose-prod.yml +++ b/dockerfiles/services/nextcloud/docker-compose-prod.yml @@ -4,10 +4,10 @@ # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose-prod.yml owncloud # DOCKER_HOST=dkhost:2376 docker stack ps owncloud -version: '3' +version: '3.4' services: - owncloud: + app: image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest ports: - 8083:80 @@ -24,6 +24,10 @@ services: condition: any delay: "1s" max_attempts: 5 + update_config: + parallelism: 1 + delay: 2s + order: start-first resources: limits: cpus: '1' @@ -36,24 +40,39 @@ services: fluentd-async-connect: 'true' tag: nextcloud - collabora: - image: collabora/code - ports: - - 9980:9980 - environment: - domain: office\\.xai-corp\\.net - username: admin - password: ah8031qhnbc - server_name: office.xai-corp.net +# collabora: +# image: collabora/code +# ports: +# - 9980:9980 +# environment: +# domain: office\\.xai-corp\\.net +# username: admin +# password: ah8031qhnbc +# server_name: office.xai-corp.net +# +# deploy: +# mode: replicated +# replicas: 0 +# restart_policy: +# condition: any +# delay: "1s" +# max_attempts: 5 +# update_config: +# parallelism: 1 +# delay: 2s +# order: start-first +# resources: +# limits: +# cpus: '1' +# memory: 512M - deploy: - mode: replicated - replicas: 0 - restart_policy: - condition: any - delay: "1s" - max_attempts: 5 - resources: - limits: - cpus: '1' - memory: 512M +networks: + default: + external: + name: ingress + ingress: + external: + name: ingress + prod: + external: + name: prod diff --git a/dockerfiles/services/nextcloud/docker-compose.yml b/dockerfiles/services/nextcloud/docker-compose.yml index 4dd6d9c..de0ca32 100644 --- a/dockerfiles/services/nextcloud/docker-compose.yml +++ b/dockerfiles/services/nextcloud/docker-compose.yml @@ -18,16 +18,16 @@ services: # - 9083:9000 volumes: - ./data:/var/www/html - - collabora: - image: collabora/code - ports: - - 9980:9980 - environment: - domain: office\\.xai-corp\\.net - username: admin - password: ah8031qhnbc - server_name: office.xai-corp.net +# +# collabora: +# image: collabora/code +# ports: +# - 9980:9980 +# environment: +# domain: office\\.xai-corp\\.net +# username: admin +# password: ah8031qhnbc +# server_name: office.xai-corp.net # letsencrypt: # image: linuxserver/letsencrypt diff --git a/dockerfiles/services/services/build_services.sh b/dockerfiles/services/services/build_services.sh new file mode 100644 index 0000000..dc1cbbc --- /dev/null +++ b/dockerfiles/services/services/build_services.sh @@ -0,0 +1,7 @@ +#!/bin/bash -ex + +docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY + +(cd fluentd && docker-compose -f docker-compose.yml build) + +docker push dkregistry.xai-corp.net:5000/fluentd:latest diff --git a/dockerfiles/services/services/dd-agent/.env b/dockerfiles/services/services/datadog/.env similarity index 100% rename from dockerfiles/services/services/dd-agent/.env rename to dockerfiles/services/services/datadog/.env diff --git a/dockerfiles/services/services/datadog/docker-compose.yml b/dockerfiles/services/services/datadog/docker-compose.yml new file mode 100644 index 0000000..8ed0f10 --- /dev/null +++ b/dockerfiles/services/services/datadog/docker-compose.yml @@ -0,0 +1,44 @@ +--- +# docker-compose file for datadog agent +# DOCKER_HOST=dkhost:2376 docker-compose up -d +# +# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services +# +# DOCKER_HOST=dkhost:2376 docker stack ps services + +version: '3.4' +services: + + datadog: + image: datadog/docker-dd-agent:latest-dogstatsd + hostname: home + environment: + API_KEY: ca0faf176c4aedd4f547ed7cf85615eb + LOG_LEVEL: INFO + ports: + - "8125:8125/udp" + deploy: + mode: global + restart_policy: + condition: any + delay: "1m" + max_attempts: 1 + update_config: + parallelism: 1 + delay: 2s + order: start-first + resources: + limits: + cpus: '1.5' + memory: 512M + +networks: + default: + external: + name: prod + ingress: + external: + name: ingress + prod: + external: + name: prod diff --git a/dockerfiles/services/services/dd-agent/docker-compose.yml b/dockerfiles/services/services/dd-agent/docker-compose.yml deleted file mode 100644 index 250cebc..0000000 --- a/dockerfiles/services/services/dd-agent/docker-compose.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -# docker-compose file for datadog agent -# DOCKER_HOST=dkhost:2376 docker-compose up -d -# -# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services -# -# DOCKER_HOST=dkhost:2376 docker stack ps services - -version: '3' -services: - - dd-agent: - image: "datadog/docker-dd-agent:latest" - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - - /proc/:/host/proc/:ro - - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro - ports: - - "8125:8125/udp" - env_file: - .env - - deploy: - mode: global - - restart_policy: - condition: any - delay: "1s" - max_attempts: 3 - resources: - limits: - cpus: '2' - memory: 512M - -#networks: -# default: -# external: -# name: prod diff --git a/dockerfiles/services/dkregistry/docker-compose.yml b/dockerfiles/services/services/dkregistry/docker-compose.yml similarity index 84% rename from dockerfiles/services/dkregistry/docker-compose.yml rename to dockerfiles/services/services/dkregistry/docker-compose.yml index 3622269..65025c1 100644 --- a/dockerfiles/services/dkregistry/docker-compose.yml +++ b/dockerfiles/services/services/dkregistry/docker-compose.yml @@ -5,7 +5,7 @@ # DOCKER_HOST=dkhost:2376 docker-compose up -d # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services -version: '3' +version: '3.4' services: registry: @@ -36,6 +36,10 @@ services: condition: any delay: "1s" max_attempts: 1 + update_config: + parallelism: 1 + delay: 2s + order: start-first resources: limits: cpus: '0.2' @@ -47,3 +51,17 @@ services: fluentd-address: "logs.xai-corp.net:24224" fluentd-async-connect: 'true' tag: dkregistry + + networks: + - ingress + +networks: + default: + external: + name: prod + ingress: + external: + name: ingress + prod: + external: + name: prod diff --git a/dockerfiles/services/services/fluentd/Dockerfile b/dockerfiles/services/services/fluentd/Dockerfile index 9498d94..2785f61 100644 --- a/dockerfiles/services/services/fluentd/Dockerfile +++ b/dockerfiles/services/services/fluentd/Dockerfile @@ -8,7 +8,6 @@ RUN apk add --update --virtual .build-deps \ && sudo gem install \ fluent-plugin-secure-forward \ fluent-plugin-loggly \ - && sudo gem sources --clear-all \ && apk del .build-deps \ && rm -rf /var/cache/apk/* \ diff --git a/dockerfiles/services/services/fluentd/docker-compose-prod.yml b/dockerfiles/services/services/fluentd/docker-compose-prod.yml new file mode 100644 index 0000000..51275ae --- /dev/null +++ b/dockerfiles/services/services/fluentd/docker-compose-prod.yml @@ -0,0 +1,38 @@ +--- +# Based on https://hub.docker.com/r/fluent/fluentd/ +# +# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# +# docker login dkregistry.xai-corp.net:5000 +# docker-compose build && docker push dkregistry.xai-corp.net:5000/fluentd:latest +# DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml services +# DOCKER_HOST=dkhost:2376 docker stack ps services + +version: '3.4' +services: + + fluentd: + image: "dkregistry.xai-corp.net:5000/fluentd:latest" + volumes: + - /opt/shared/logs:/fluentd/log + ports: + - "24224:24224" + - "24224:24224/udp" + + deploy: + mode: global + restart_policy: + condition: any + delay: "1s" + max_attempts: 3 + update_config: + parallelism: 1 + delay: 2s + order: start-first + resources: + limits: + cpus: '0.5' + memory: 64M + + networks: + - ingress diff --git a/dockerfiles/services/services/fluentd/docker-compose.yml b/dockerfiles/services/services/fluentd/docker-compose.yml index 25159b6..f4590d4 100644 --- a/dockerfiles/services/services/fluentd/docker-compose.yml +++ b/dockerfiles/services/services/fluentd/docker-compose.yml @@ -8,12 +8,12 @@ # DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose.yml services # DOCKER_HOST=dkhost:2376 docker stack ps services -version: '3' +version: '3.4' services: fluentd: build: - context: "" + context: . dockerfile: Dockerfile image: "dkregistry.xai-corp.net:5000/fluentd:latest" volumes: @@ -21,16 +21,3 @@ services: ports: - "24224:24224" - "24224:24224/udp" - - - deploy: - mode: global - - restart_policy: - condition: any - delay: "1s" - max_attempts: 3 - resources: - limits: - cpus: '0.5' - memory: 64M diff --git a/dockerfiles/services/services/launch_services.sh b/dockerfiles/services/services/launch_services.sh new file mode 100755 index 0000000..2a1d0f6 --- /dev/null +++ b/dockerfiles/services/services/launch_services.sh @@ -0,0 +1,28 @@ +#!/bin/bash -ex + +export DOCKER_HOST=dkmanager:2376 + +CONFIG=stack.tmp.yml +SERVICE=services +#NETWORK=prod + +docker stack deploy --with-registry-auth -c dkregistry/docker-compose.yml $SERVICE + +docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY + +docker network inspect $NETWORK > /dev/null || docker network create -d overlay $NETWORK + +docker-compose \ + -f network.yml \ + -f fluentd/docker-compose-prod.yml \ + -f mariadb/docker-compose.yml \ + -f postgres/docker-compose.yml \ + -f memcached/docker-compose.yml \ + -f redis/docker-compose.yml \ + -f datadog/docker-compose.yml \ + config > $CONFIG + +docker stack deploy --prune --with-registry-auth -c $CONFIG $SERVICE + +# Cleanup +rm $CONFIG diff --git a/dockerfiles/services/services/mariadb/docker-compose.yml b/dockerfiles/services/services/mariadb/docker-compose.yml index 1a8a0ad..459e8ce 100644 --- a/dockerfiles/services/services/mariadb/docker-compose.yml +++ b/dockerfiles/services/services/mariadb/docker-compose.yml @@ -3,7 +3,7 @@ # DOCKER_HOST=dkhost:2376 docker-compose up -d # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services -version: '3' +version: '3.4' services: mysql: @@ -22,19 +22,22 @@ services: condition: any delay: "1s" max_attempts: 3 + update_config: + parallelism: 1 + delay: 2s + order: start-first resources: limits: cpus: '0.5' memory: 512M - logging: driver: fluentd options: fluentd-address: "logs.xai-corp.net:24224" + fluentd-async-connect: 'true' tag: mariadb -networks: - default: - external: - name: prod + networks: + - prod + - ingress diff --git a/dockerfiles/services/services/memcached/docker-compose.yml b/dockerfiles/services/services/memcached/docker-compose.yml index 8cd970b..6f6cc24 100644 --- a/dockerfiles/services/services/memcached/docker-compose.yml +++ b/dockerfiles/services/services/memcached/docker-compose.yml @@ -4,7 +4,7 @@ # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services # DOCKER_HOST=dkhost:2376 docker service ps services_memcached -version: '3' +version: '3.4' services: memcached: @@ -15,25 +15,27 @@ services: - memcached - -m64 - deploy: - mode: replicated - replicas: 3 - restart_policy: - condition: any - delay: "1s" - max_attempts: 3 - resources: - limits: - cpus: '0.5' - memory: 65M - logging: driver: fluentd options: fluentd-address: "logs.xai-corp.net:24224" tag: memcached -networks: - default: - external: - name: prod + deploy: + mode: replicated + replicas: 1 + restart_policy: + condition: any + delay: "1s" + max_attempts: 3 + update_config: + parallelism: 1 + delay: 2s + order: start-first + resources: + limits: + cpus: '0.5' + memory: 65M + + networks: + - prod diff --git a/dockerfiles/services/services/network.yml b/dockerfiles/services/services/network.yml new file mode 100644 index 0000000..80f8f9f --- /dev/null +++ b/dockerfiles/services/services/network.yml @@ -0,0 +1,15 @@ +--- +# docker-compose file for defining networks used by services + +version: '3.4' + +networks: + default: + external: + name: prod + ingress: + external: + name: ingress + prod: + external: + name: prod diff --git a/dockerfiles/services/services/postgres/docker-compose.yml b/dockerfiles/services/services/postgres/docker-compose.yml index 8108c93..d2a3366 100644 --- a/dockerfiles/services/services/postgres/docker-compose.yml +++ b/dockerfiles/services/services/postgres/docker-compose.yml @@ -1,7 +1,7 @@ # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services # DOCKER_HOST=dkhost:2376 docker service ps services_postgres -version: '3' +version: '3.4' services: postgres: volumes: @@ -15,6 +15,13 @@ services: ports: - 5432:5432 + logging: + driver: fluentd + options: + fluentd-address: "logs.xai-corp.net:24224" + fluentd-async-connect: 'true' + tag: postgres + deploy: mode: replicated replicas: 1 @@ -22,12 +29,14 @@ services: condition: any delay: "1s" max_attempts: 1 + update_config: + parallelism: 1 + delay: 2s + order: start-first resources: limits: cpus: '0.5' memory: 128M -networks: - default: - external: - name: prod + networks: + - prod diff --git a/dockerfiles/services/services/redis/docker-compose.yml b/dockerfiles/services/services/redis/docker-compose.yml index 71d012b..2df34f8 100644 --- a/dockerfiles/services/services/redis/docker-compose.yml +++ b/dockerfiles/services/services/redis/docker-compose.yml @@ -2,7 +2,7 @@ # docker-compose file for redis # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services -version: '3' +version: '3.4' services: redis: @@ -17,6 +17,10 @@ services: condition: any delay: "1s" max_attempts: 3 + update_config: + parallelism: 1 + delay: 2s + order: start-first resources: limits: cpus: '0.5' @@ -26,9 +30,8 @@ services: driver: fluentd options: fluentd-address: "logs.xai-corp.net:24224" + fluentd-async-connect: 'true' tag: redis -networks: - default: - external: - name: prod + networks: + - prod diff --git a/dockerfiles/services/sslproxy/docker-compose-prod.yml b/dockerfiles/services/sslproxy/docker-compose-prod.yml index c575c71..03052bb 100644 --- a/dockerfiles/services/sslproxy/docker-compose-prod.yml +++ b/dockerfiles/services/sslproxy/docker-compose-prod.yml @@ -5,7 +5,7 @@ # DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml sslproxy # DOCKER_HOST=dkhost:2376 docker stack ps sslproxy -version: '3' +version: '3.4' services: app: image: "dkregistry.xai-corp.net:5000/sslproxy:2.1" @@ -21,13 +21,13 @@ services: # syslog-address: "tcp+tls://logs6.papertrailapp.com:38577" # tag: "{{.Name}}/{{.ID}}" -# logging: -# driver: fluentd# tag: sslproxy + logging: + driver: fluentd + tag: sslproxy + options: + fluentd-address: "logs.xai-corp.net:24224" + fluentd-async-connect: 'true' - -# options: -# fluentd-address: "logs.xai-corp.net:24224" -# fluentd-async-connect: 'true' # logging: # driver: syslog # options: @@ -39,11 +39,11 @@ services: restart_policy: condition: any delay: 6s - max_attempts: 10 -# update_config: -# parallelism: 2 -# delay: 2s -# order: start-first + max_attempts: 3 + update_config: + parallelism: 1 + delay: 2s + order: start-first resources: limits: cpus: '0.1' @@ -52,14 +52,14 @@ services: labels: net.xai-corp.sslproxy.description: proxy ssl calls to non ssl containers - networks: - - ingress +# networks: +# - ingress # - prod -networks: - ingress: - external: - name: ingress - prod: - external: - name: prod +#networks: +# ingress: +# external: +# name: ingress +# prod: +# external: +# name: prod diff --git a/dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf index 4dff0c6..8da57f3 100644 --- a/dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf +++ b/dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf @@ -5,10 +5,15 @@ server { ssl_certificate_key /etc/letsencrypt/live/xai-corp.net/privkey.pem; #Strict-Transport-Security: max-age=15768000 - #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always; + add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always; location / { proxy_pass http://dkhost.xai-corp.net:8084; + proxy_set_header Host $host; # required for docker client's sake + proxy_set_header X-Real-IP $remote_addr; # pass on real client's IP + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Connection $http_connection; } } diff --git a/dockerfiles/services/ui/docker-compose.yml b/dockerfiles/services/ui/docker-compose.yml index 66571c2..a757dc5 100644 --- a/dockerfiles/services/ui/docker-compose.yml +++ b/dockerfiles/services/ui/docker-compose.yml @@ -2,11 +2,11 @@ # DOCKER_HOST=192.168.2.41:2376 docker-compose up -d # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml dkui -version: '3' +version: '3.4' services: app: - restart: always - privileged: true +# restart: always +# privileged: true image: "portainer/portainer" volumes: @@ -23,6 +23,10 @@ services: condition: any delay: 5s max_attempts: 10 + update_config: + parallelism: 1 + delay: 2s + order: start-first labels: net.xai-corp.dkui.description: portainer ui for docker host and swarm management resources: @@ -37,3 +41,14 @@ services: fluentd-address: "logs.xai-corp.net:24224" fluentd-async-connect: 'true' tag: dkui + +networks: + default: + external: + name: ingress + ingress: + external: + name: ingress + prod: + external: + name: prod diff --git a/inventory.conf b/inventory.conf index 3161ec0..7bfd99a 100644 --- a/inventory.conf +++ b/inventory.conf @@ -4,7 +4,7 @@ localhost ansible_connection=local 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 +dkhost02 ansible_ssh_host=192.168.2.43 dkhost03 ansible_ssh_host=192.168.2.53 #dkhost04 ansible_ssh_host=192.168.2.54 #dkhost05 ansible_ssh_host=192.168.2.55 @@ -12,13 +12,13 @@ dkhost03 ansible_ssh_host=192.168.2.53 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 +dkhost01 ansible_ssh_host=192.168.2.41 +dkhost02 ansible_ssh_host=192.168.2.52 #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 -localhost ansible_connection=local +home ansible_ssh_host=192.168.2.11 +#localhost ansible_connection=local [ns] home02 ansible_ssh_host=192.168.2.22 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 36c1368..2c38e43 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 @@ -27,7 +27,7 @@ cubox-i IN A 192.168.2.12 ; virtual machine servers home02 IN A 192.168.2.22 dkhost01 IN A 192.168.2.41 -dkhost02 IN A 192.168.2.43 +dkhost02 IN A 192.168.2.52 dkhost03 IN A 192.168.2.53 dkhost04 IN A 192.168.2.54 dkhost05 IN A 192.168.2.55 @@ -41,12 +41,18 @@ gluster IN A 192.168.2.11 gluster IN A 192.168.2.12 ; docker swarm nodes -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.11 +;dkhost IN A 192.168.2.41 +dkhost IN A 192.168.2.52 +;dkhost IN A 192.168.2.53 +dkhost IN A 192.168.2.54 ;dkhost IN A 192.168.2.55 +; docker swarm managers +dkmanager IN A 192.168.2.11 +dkmanager IN A 192.168.2.52 +dkmanager IN A 192.168.2.54 + ; service domains fs IN CNAME dkhost git IN CNAME dkhost diff --git a/scripts/reboot.sh b/scripts/reboot.sh new file mode 100644 index 0000000..e8a391e --- /dev/null +++ b/scripts/reboot.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# run ansible playbook to update name servers + +ansible-playbook -vv ns.xai-corp.net.yml -i inventory.conf -u ansible