xai-corp.net/provisioning
1
0
Fork 0
Code Issues 9 Releases Activity

changed network ip range to 192.168.4.0/24

Browse Source
This commit is contained in:
richard
2020-07-19 08:11:08 -04:00
parent 8f76a81a7b
commit 9351caf5b0
29 changed files with 104 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
cli/.bash_cli Normal file
View File

10
cli/ansible Executable file
View File

@@ -0,0 +1,10 @@
#!/usr/bin/env bash
echo -e "\033[36mStarting\033[39m: Ansible"
# shellcheck disable=SC2068
docker run --rm -i\
-v ~/.ssh:/home/user/.ssh \
-u 1000 \
-v ${PWD}:/opt/project \
-w /opt/project \
dkregistry.xai-corp.net:5000/xaicorp/ansible:2.7 -i inventory.conf -u ansible $@

13
cli/ansible-dev Executable file
View File

@@ -0,0 +1,13 @@
#!/usr/bin/env bash
echo -e "\033[36mStarting\033[39m: Ansible"
# shellcheck disable=SC2068
docker run --rm \
-it \
-v $(pwd):/opt/project \
-v ~/.ssh:/user/.ssh \
-u $(id -u):$(id -g) \
--workdir /opt/project \
--entrypoint /bin/bash \
dkregistry.xai-corp.net:5000/xaicorp/ansible:2.0 $@

3
cli/ansible-dev.help Normal file
View File

@@ -0,0 +1,3 @@
ARGS - The arguments you wish to provide to this command
TODO: Fill out the help information for this command.

1
cli/ansible-dev.usage Normal file
View File

@@ -0,0 +1 @@
ARGS...

3
cli/ansible.help Normal file
View File

@@ -0,0 +1,3 @@
ARGS - The arguments you wish to provide to this command
TODO: Fill out the help information for this command.

1
cli/ansible.usage Normal file
View File

@@ -0,0 +1 @@
ARGS...

2
dockerfiles/services/gitea/docker-compose.yml
View File

@@ -1,5 +1,5 @@
---
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d
# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml gitea
version: '3.4'

2
dockerfiles/services/jenkins/docker-compose.yml
View File

@@ -1,5 +1,5 @@
---
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d
# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml jenkins
version: '3.4'

2
dockerfiles/services/orangescrum/docker-compose.yml
View File

@@ -1,5 +1,5 @@
---
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d
version: '2'
services:

2
dockerfiles/services/services/fluentd/docker-compose-prod.yml
View File

@@ -1,7 +1,7 @@
---
# Based on https://hub.docker.com/r/fluent/fluentd/
#
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# DOCKER_HOST=192.168.4.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

2
dockerfiles/services/services/fluentd/docker-compose.yml
View File

@@ -1,7 +1,7 @@
---
# Based on https://hub.docker.com/r/fluent/fluentd/
#
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# DOCKER_HOST=192.168.4.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

2
dockerfiles/services/shipyard/docker-compose.yml
View File

@@ -26,7 +26,7 @@ services:
- manage
- --host
- tcp://0.0.0.0:3375
- etcd://192.168.2.53:4001
- etcd://192.168.4.53:4001
shipyard-controller:
restart: always

2
dockerfiles/services/sslproxy/docker-compose.prod.yml
View File

@@ -1,5 +1,5 @@
---
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d
# docker login dkregistry.xai-corp.net:5000
# docker-compose build && docker push dkregistry.xai-corp.net:5000/sslproxy:2.1
# DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml sslproxy

2
dockerfiles/services/sslproxy/docker-compose.yml
View File

@@ -1,5 +1,5 @@
---
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d
# docker login dkregistry.xai-corp.net:5000
# docker-compose build && docker push dkregistry.xai-corp.net:5000/sslproxy:2.1
# DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose.yml sslproxy

2
dockerfiles/services/ui/docker-compose.yml
View File

@@ -1,5 +1,5 @@
---
# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d
# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d
# DOCKER_HOST=dkmanager:2376 docker stack deploy -c docker-compose.yml dkui
version: '3.4'

36
inventory.conf
View File

@@ -1,29 +1,29 @@
localhost ansible_connection=local
[managed]
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.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
cubox-i ansible_ssh_host=192.168.2.12
home ansible_ssh_host=192.168.4.11
home02 ansible_ssh_host=192.168.4.22
#dkhost01 ansible_ssh_host=192.168.4.41
#dkhost02 ansible_ssh_host=192.168.4.52
#dkhost03 ansible_ssh_host=192.168.4.53
#dkhost04 ansible_ssh_host=192.168.4.54
#dkhost05 ansible_ssh_host=192.168.4.55
cubox-i ansible_ssh_host=192.168.4.12
[dkhost]
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
dkhost01 ansible_ssh_host=192.168.4.41
dkhost02 ansible_ssh_host=192.168.4.52
#dkhost03 ansible_ssh_host=192.168.4.53
dkhost04 ansible_ssh_host=192.168.4.54
#dkhost05 ansible_ssh_host=192.168.4.55
home ansible_ssh_host=192.168.4.11
#localhost ansible_connection=local
[ns]
home02 ansible_ssh_host=192.168.2.22
cubox-i ansible_ssh_host=192.168.2.12
home02 ansible_ssh_host=192.168.4.22
cubox-i ansible_ssh_host=192.168.4.12
[gfs]
home ansible_ssh_host=192.168.2.11
cubox-i ansible_ssh_host=192.168.2.12
home ansible_ssh_host=192.168.4.11
cubox-i ansible_ssh_host=192.168.4.12

2
roles/docker_graylog/files/docker-compose.yml
View File

@@ -20,7 +20,7 @@ services:
environment:
GRAYLOG_PASSWORD_SECRET: gsahu1dj901hdaiuafg3g1q
GRAYLOG_ROOT_PASSWORD_SHA2: 8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918
GRAYLOG_WEB_ENDPOINT_URI: http://192.168.2.41:9000/api/
GRAYLOG_WEB_ENDPOINT_URI: http://192.168.4.41:9000/api/
depends_on:
- mongo
- elasticsearch

4
roles/docker_registry/files/docker-compose.yml
View File

@@ -9,8 +9,8 @@ registry:
# REGISTRY_HTTP_TLS_KEY: /certs/privkey.pem
REGISTRY_HTTP_LETSENCRYPT_CACHEFILE: /var/run/letsencrypt.cache
REGISTRY_HTTP_LETSENCRYPT_EMAIL: r_morgan@sympatico.ca
# REGISTRY_HTTP_HOST: https://192.168.2.41:5000
# REGISTRY_HTTP_ADDR: 192.168.2.41:5000
# REGISTRY_HTTP_HOST: https://192.168.4.41:5000
# REGISTRY_HTTP_ADDR: 192.168.4.41:5000
REGISTRY_AUTH: htpasswd
REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd
REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm

4
roles/dockerhost/files/daemon.json
View File

@@ -3,8 +3,8 @@
"dkhost.xai-corp.net:5000"
],
"dns": [
"192.168.2.12",
"192.168.2.22",
"192.168.4.12",
"192.168.4.22",
"8.8.8.8"
]
}

4
roles/home.xai-corp.net/templates/home.xai-corp.net.j2
View File

@@ -4,7 +4,7 @@
ServerName home.xai-corp.net
Redirect / https://home.xai-corp.net/
</VirtualHost>
<VirtualHost *:443>
ServerName home.xai-corp.net
ServerAdmin admin@xai-corp.net
@@ -21,7 +21,7 @@
Options Indexes FollowSymLinks
AllowOverride All
Order deny,allow
Allow from 192.168.2.
Allow from 192.168.4.
</Directory>
</VirtualHost>

2
roles/home.xai-corp.net/templates/sql.xai-corp.net.j2
View File

@@ -21,7 +21,7 @@
Options Indexes FollowSymLinks
AllowOverride All
Order deny,allow
Allow from 192.168.2.
Allow from 192.168.4.
</Directory>
</VirtualHost>

8
roles/ns.xai-corp.net/templates/named.conf.j2
View File

@@ -23,7 +23,7 @@ acl "xfer" {
*/
acl "trusted" {
127.0.0.0/8;
192.168.2.0/24;
192.168.4.0/24;
::1/128;
};
@@ -35,7 +35,7 @@ options {
//bindkeys-file "/etc/bind/bind.keys";
/*listen-on-v6 { ::1; };*/
listen-on { 127.0.0.1; 192.168.2.12; };
listen-on { 127.0.0.1; 192.168.4.12; };
allow-query {
/*
@@ -123,7 +123,7 @@ controls {
};
view "internal" {
match-clients { 192.168.2.12; localhost; 192.168.2.0/24; };
match-clients { 192.168.4.12; localhost; 192.168.4.0/24; };
recursion yes;
zone "." in {
@@ -149,7 +149,7 @@ view "internal" {
allow-transfer { none; };
};
zone "2.168.192.in-addr.arpa." IN {
zone "4.168.192.in-addr.arpa." IN {
type master;
file "pri/xai-corp.net.reverse";
allow-update { none; };

2
roles/ns.xai-corp.net/templates/named.conf.local.j2
View File

@@ -29,7 +29,7 @@ view "internal" {
allow-transfer { none; };
};
zone "2.168.192.in-addr.arpa." IN {
zone "4.168.192.in-addr.arpa." IN {
type master;
file "/etc/bind/db.xai-corp.net.reverse";
allow-update { none; };

2
roles/ns.xai-corp.net/templates/named.conf.options.j2
View File

@@ -23,7 +23,7 @@ acl "xfer" {
*/
acl "trusted" {
127.0.0.0/8;
192.168.2.0/24;
192.168.4.0/24;
::1/128;
};

58
roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2
View File

@@ -8,50 +8,50 @@ $TTL 1D
xai-corp.net. IN NS ns.xai-corp.net.
xai-corp.net. IN MX 0 mail.xai-corp.net.
xai-corp.net. IN TXT "v=spf1 ip4:192.168.2.11/32 mx ptr mx:mail.xai-corp.net ~all"
;mail IN A 192.168.2.12
xai-corp.net. IN TXT "v=spf1 ip4:192.168.4.11/32 mx ptr mx:mail.xai-corp.net ~all"
;mail IN A 192.168.4.12
gateway IN A 192.168.2.1
wireless IN A 192.168.2.3
printer IN A 192.168.2.13
gateway IN A 192.168.4.4
wireless IN A 192.168.4.3
printer IN A 192.168.4.13
scanner IN CNAME printer
laser IN A 192.168.2.14
tv IN A 192.168.2.16
xaicorp1 IN A 192.168.2.103
garden IN A 192.168.2.20
laser IN A 192.168.4.14
tv IN A 192.168.4.16
xaicorp1 IN A 192.168.4.103
garden IN A 192.168.4.20
; bare metal servers
home IN A 192.168.2.11
cubox-i IN A 192.168.2.12
home IN A 192.168.4.11
cubox-i IN A 192.168.4.12
; virtual machine servers
home02 IN A 192.168.2.22
dkhost01 IN A 192.168.2.41
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
home02 IN A 192.168.4.22
dkhost01 IN A 192.168.4.41
dkhost02 IN A 192.168.4.52
dkhost03 IN A 192.168.4.53
dkhost04 IN A 192.168.4.54
dkhost05 IN A 192.168.4.55
; dns servers
ns IN A 192.168.2.22
ns IN A 192.168.4.22
ns02 IN CNAME cubox-i
; gluster servers
gluster IN A 192.168.2.11
;gluster IN A 192.168.2.12
gluster IN A 192.168.4.11
;gluster IN A 192.168.4.12
; docker swarm nodes
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
dkhost IN A 192.168.4.11
;dkhost IN A 192.168.4.41
;dkhost IN A 192.168.4.52
;dkhost IN A 192.168.4.53
;dkhost IN A 192.168.4.54
;dkhost IN A 192.168.4.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
dkmanager IN A 192.168.4.11
;dkmanager IN A 192.168.4.52
;dkmanager IN A 192.168.4.54
; service domains
fs IN CNAME dkhost

2
roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2
View File

@@ -1,5 +1,5 @@
$TTL 24h
$ORIGIN 2.168.192.IN-ADDR.ARPA.
$ORIGIN 4.168.192.IN-ADDR.ARPA.
@ IN SOA ns.xai-corp.net. root.xai-corp.net. (
20150920; serial
3h ; refresh

2
roles/td-agent-bit/files/td.conf
View File

@@ -11,6 +11,6 @@
[OUTPUT]
Name Forward
Host 192.168.2.24
Host 192.168.4.24
Port 24224
Match **

3
test-ping.yml
View File

@@ -2,10 +2,9 @@
# playbook to install django test on home.xai-corp.net
- hosts: managed
remote_user: root
remote_user: ansible
gather_facts: yes
become: true
# become: true
tasks:
- name: test connection