Attempt to fix overlay net ip shuffling with constrained subnet id

backend.yaml

@@ -16,7 +16,7 @@ services:
       - /var/lib/docker/volumes:/var/lib/docker/volumes
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.5"
+        ipv4_address: "172.252.1.5"
   ###~~~~~~ Then, we will need numerous databases for our various services ~~~~~~###
   # We want neo4j as a graph database that can easily be used by other services
   neo4j:
@@ -60,7 +60,7 @@ services:
   #     - stack_dataverse_triggers:/triggers
   #   networks:
   #     i-form_research_server_stack:
-  #        ipv4_address: "172.252.0.6"
+  #        ipv4_address: "172.252.1.6"
   #   labels:
   #     - "traefik.enable=true"
   #     - "traefik.http.routers.go.rule=Path(`/`)"
@@ -91,14 +91,14 @@ services:
       MYSQL_USER: "elabftw"
       MYSQL_PASSWORD_FILE: /run/secrets/elabftw_sql_key
       MYSQL_ROOT_PASSWORD: "test" # MYSQL_RANDOM_ROOT_PASSWORD: 1
-      MYSQL_HOST: "172.252.0.15" # Needs to allow access from the elabftw container
+      MYSQL_HOST: "172.252.1.15" # Needs to allow access from the elabftw container
-      MYSQL_ROOT_HOST: "172.252.0.15"
+      MYSQL_ROOT_HOST: "172.252.1.15"
       TZ: "Europe/Paris"
     volumes:
       - stack_elabftw_sql:/var/lib/mysql
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.7"
+        ipv4_address: "172.252.1.7"
   ###~~~~~~ Then, we plan our general utility services ~~~~~~###
   # The following service is a simple nginx server that hosts static websites
   nginx:
@@ -113,7 +113,7 @@ services:
         condition: on-failure
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.8"
+        ipv4_address: "172.252.1.8"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.go.rule=Path(`/`)"
@@ -154,7 +154,7 @@ services:
   #     - "traefik.http.routers.solr.tls.certresolver=myresolver"
   #   networks:
   #     i-form_research_server_stack:
-  #       ipv4_address: "172.252.0.9"
+  #       ipv4_address: "172.252.1.9"
 
   # minio:
   #   image: minio/minio:RELEASE.2021-10-06T23-36-31Z
@@ -187,7 +187,7 @@ services:
   #       - traefik.http.services.minio-console.loadbalancer.server.port=9001
   #   networks:
   #     i-form_research_server_stack:
-  #       ipv4_address: "172.252.0.10"
+  #       ipv4_address: "172.252.1.10"
 
   # dataverse:
   #   image: coronawhy/dataverse:5.13.allclouds
@@ -291,7 +291,7 @@ services:
   #     - "traefik.http.routers.dataverse.tls.certresolver=myresolver"
   #   networks:
   #     i-form_research_server_stack:
-  #       ipv4_address: "172.252.0.11"
+  #       ipv4_address: "172.252.1.11"
 
 networks:
   i-form_research_server_stack:

frontend.yaml

@@ -14,7 +14,7 @@ services:
         condition: on-failure
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.12"
+        ipv4_address: "172.252.1.12"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.go.rule=Path(`/`)"
@@ -33,7 +33,7 @@ services:
         condition: on-failure
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.13"
+        ipv4_address: "172.252.1.13"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.go.rule=Path(`/`)"
@@ -48,7 +48,7 @@ services:
       - stack_senaite:/data
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.14"
+        ipv4_address: "172.252.1.14"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.go.rule=Path(`/`)"
@@ -73,7 +73,7 @@ services:
       - elabftw_secret_key
     environment:
       SECRET_KEY: $${cat /run/secrets/elabftw_secret_key}
-      DB_HOST: "172.252.0.7"
+      DB_HOST: "172.252.1.7"
       DB_PORT: "3306"
       DB_NAME: "elabftw"
       DB_USER: "elabftw"
@@ -98,7 +98,7 @@ services:
       #- /etc/letsencrypt:/ssl
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.15"
+        ipv4_address: "172.252.1.15"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.go.rule=Path(`/`)"

ip_map.txt

@@ -1,14 +1,14 @@
-coredns: 172.252.0.2
+coredns: 172.252.1.2
-traefik: 172.252.0.3
+traefik: 172.252.1.3
-rsync: 172.252.0.4
+rsync: 172.252.1.4
-portainer-agent: 172.252.0.5
+portainer-agent: 172.252.1.5
-dataverse_db: 172.252.0.6
+dataverse_db: 172.252.1.6
-mysql: 172.252.0.7  <- needs to be changed once elabftw is set
+mysql: 172.252.1.7  <- needs to be changed once elabftw is set
-nginx: 172.252.0.8
+nginx: 172.252.1.8
-solr: 172.252.0.9
+solr: 172.252.1.9
-minio: 172.252.0.10
+minio: 172.252.1.10
-dataverse: 172.252.0.11
+dataverse: 172.252.1.11
-grafana: 172.252.0.12
+grafana: 172.252.1.12
-neodash: 172.252.0.13
+neodash: 172.252.1.13
-senaite: 172.252.0.14
+senaite: 172.252.1.14
-elabftw: 172.252.0.15
+elabftw: 172.252.1.15

networks.yaml

@@ -15,7 +15,7 @@ services:
         condition: on-failure
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.2"
+        ipv4_address: "172.252.1.2"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.go.rule=Path(`/`)"
@@ -53,7 +53,7 @@ services:
         condition: on-failure
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.3"
+        ipv4_address: "172.252.1.3"
     # secrets:
     #   - traefik_cert
     #   - traefik_key
@@ -65,7 +65,7 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: 172.252.0.0/16
+        - subnet: 172.252.1.0/16
 
 volumes:
   networks_traefik:

volumes.yaml

@@ -13,7 +13,7 @@ services:
       - rsync_etc:/etc
     networks:
       i-form_research_server_stack:
-        ipv4_address: "172.252.0.4"
+        ipv4_address: "172.252.1.4"
 
 # This defines the NFS volumes for persistence
 #! This requires nodes to be IP whitelisted in the NAS