Minor changes after testing

Author: alvinr

mariadb/vote/README.md

@@ -27,7 +27,7 @@ Start the Viz:
 
      $ cd common/viz
      $ source scripts/setup.sh
-     $ scripts/up.sh swarm-0
+     $ docker stack deploy viz -c docker-compose.stack.yml
      $ echo "$(docker-machine ip swarm-0) viz.myapp.com" | sudo tee -a /etc/hosts
 
 The app will be available at http://viz.myapp.com:3000    

mariadb/vote/prod/galera/README.md

@@ -8,7 +8,6 @@ To start app in production:
     $ cd prod/galera
     $ source ../scripts/setup.sh
     $ docker network create -d overlay --attachable myapp_back
-    $ docker secret create mariadb_root_password mariadb_password.txt
     $ docker stack deploy myapp -c docker-compose.stack.yml
     $ docker-compose -f schema.yml up
 
@@ -66,3 +65,10 @@ You can log onto the MariaDB and look at data
     +--------------------+-------+
     1 row in set (0.00 sec)
 
+## Running demo - Part Four: MaxScale routing tier in production
+
+    $ docker stack scale myapp_maxscale=4
+    
+You can use maxadmin to view request routing
+
+    $ docker $(docker-machine config swarm-2) exec -it 63bb00e678b4 maxadmin show services

mariadb/vote/prod/galera/docker-compose.stack.yml

@@ -19,8 +19,6 @@ services:
     networks:
       - front
       - back
-    depends_on:
-      - web
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     ports:
@@ -51,13 +49,11 @@ services:
 
   mariadb_cluster:
     image: alvinr/mariadb-galera-swarm
-    # image: colinmollenhour/mariadb-galera-swarm
     environment:
       MYSQL_ROOT_PASSWORD_FILE: "/run/secrets/mariadb_root_password"
       XTRABACKUP_PASSWORD_FILE: "/run/secrets/xtrabackup_password"
       CLUSTER_NAME: "prod-vote"
       NODE_ADDRESS: "eth0"
-      CLIENT_NODE_ADDR: "10.0.0.%"
       MYSQL_USER: "app"
       MYSQL_DATABASE: "test"
       MYSQL_PASSWORD_FILE: "/run/secrets/app_password"
@@ -78,13 +74,11 @@ services:
 
   mariadb_cluster_node:
     image: alvinr/mariadb-galera-swarm
-    # image: colinmollenhour/mariadb-galera-swarm
     environment:
       MYSQL_ROOT_PASSWORD_FILE: "/run/secrets/mariadb_root_password"
       XTRABACKUP_PASSWORD_FILE: "/run/secrets/xtrabackup_password"
       CLUSTER_NAME: "prod-vote"
       NODE_ADDRESS: "eth0"
-      CLIENT_NODE_ADDR: "10.0.0.%"
       MYSQL_USER: "app"
       MYSQL_DATABASE: "test"
       MYSQL_PASSWORD_FILE: "/run/secrets/app_password"
@@ -109,15 +103,15 @@ services:
       DB_SERVICE_NAMES: "myapp_mariadb_cluster myapp_mariadb_cluster_node"
       DB_TARGET_COUNT: "3"
       ENABLE_ROOT_USER: "false"
-      # MAX_USER: "root"
-      # MAX_PASS_FILE: "/run/secrets/mariadb_root_password"
       MAX_USER: "app"
       MAX_PASS_FILE: "/run/secrets/app_password"
     labels:
       com.mariadb.cluster: "myapp-maxscale"
     networks:
       - back
     deploy:
-      replicas: 1
+      replicas: 2
+      placement:
+        constraints: [engine.labels.com.mariadb.cluster != myapp-maxscale]
     secrets:
       - app_password