From 21a39a2511d64149079071d4df75ef2045e86619 Mon Sep 17 00:00:00 2001
From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
Date: Sat, 13 Feb 2016 19:07:19 +0900
Subject: [PATCH] Change controller IP addresses for HAProxy

Change-Id: I01c8d956093d98c1422693a6fad942b819717dd6
Closes-Bug: #1545232
---
 doc/ha-guide/source/controller-ha-haproxy.rst | 84 +++++++++----------
 .../source/controller-ha-pacemaker.rst        | 13 ++-
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/doc/ha-guide/source/controller-ha-haproxy.rst b/doc/ha-guide/source/controller-ha-haproxy.rst
index d9397ef2..810e7340 100644
--- a/doc/ha-guide/source/controller-ha-haproxy.rst
+++ b/doc/ha-guide/source/controller-ha-haproxy.rst
@@ -87,17 +87,17 @@ You need a copy of it on each controller node.
      option  tcpka
      option  httpchk
      option  tcplog
-     server controller1 10.0.0.1:443 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:443 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:443 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:443 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:443 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:443 check inter 2000 rise 2 fall 5
 
    listen galera_cluster
      bind <Virtual IP>:3306
      balance  source
      option  httpchk
-     server controller1 10.0.0.1:3306 check port 9200 inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:3306 backup check port 9200 inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:3306 backup check port 9200 inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:3306 check port 9200 inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:3306 backup check port 9200 inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:3306 backup check port 9200 inter 2000 rise 2 fall 5
 
    listen glance_api_cluster
      bind <Virtual IP>:9292
@@ -105,18 +105,18 @@ You need a copy of it on each controller node.
      option  tcpka
      option  httpchk
      option  tcplog
-     server controller1 10.0.0.1:9292 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:9292 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:9292 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:9292 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:9292 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:9292 check inter 2000 rise 2 fall 5
 
    listen glance_registry_cluster
      bind <Virtual IP>:9191
      balance  source
      option  tcpka
      option  tcplog
-     server controller1 10.0.0.1:9191 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:9191 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:9191 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:9191 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:9191 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:9191 check inter 2000 rise 2 fall 5
 
    listen keystone_admin_cluster
      bind <Virtual IP>:35357
@@ -124,9 +124,9 @@ You need a copy of it on each controller node.
      option  tcpka
      option  httpchk
      option  tcplog
-     server controller1 10.0.0.1:35357 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:35357 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:35357 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:35357 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:35357 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:35357 check inter 2000 rise 2 fall 5
 
    listen keystone_public_internal_cluster
      bind <Virtual IP>:5000
@@ -134,18 +134,18 @@ You need a copy of it on each controller node.
      option  tcpka
      option  httpchk
      option  tcplog
-     server controller1 10.0.0.1:5000 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:5000 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:5000 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:5000 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:5000 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:5000 check inter 2000 rise 2 fall 5
 
    listen nova_ec2_api_cluster
      bind <Virtual IP>:8773
      balance  source
      option  tcpka
      option  tcplog
-     server controller1 10.0.0.1:8773 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:8773 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:8773 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:8773 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:8773 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:8773 check inter 2000 rise 2 fall 5
 
    listen nova_compute_api_cluster
      bind <Virtual IP>:8774
@@ -153,18 +153,18 @@ You need a copy of it on each controller node.
      option  tcpka
      option  httpchk
      option  tcplog
-     server controller1 10.0.0.1:8774 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:8774 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:8774 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:8774 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:8774 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:8774 check inter 2000 rise 2 fall 5
 
    listen nova_metadata_api_cluster
      bind <Virtual IP>:8775
      balance  source
      option  tcpka
      option  tcplog
-     server controller1 10.0.0.1:8775 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:8775 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:8775 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:8775 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:8775 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:8775 check inter 2000 rise 2 fall 5
 
    listen cinder_api_cluster
      bind <Virtual IP>:8776
@@ -172,27 +172,27 @@ You need a copy of it on each controller node.
      option  tcpka
      option  httpchk
      option  tcplog
-     server controller1 10.0.0.1:8776 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:8776 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:8776 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:8776 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:8776 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:8776 check inter 2000 rise 2 fall 5
 
    listen ceilometer_api_cluster
      bind <Virtual IP>:8777
      balance  source
      option  tcpka
      option  tcplog
-     server controller1 10.0.0.1:8777 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:8777 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:8777 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:8777 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:8777 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:8777 check inter 2000 rise 2 fall 5
 
    listen nova_vncproxy_cluster
      bind <Virtual IP>:6080
      balance  source
      option  tcpka
      option  tcplog
-     server controller1 10.0.0.1:6080 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:6080 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:6080 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:6080 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:6080 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:6080 check inter 2000 rise 2 fall 5
 
    listen neutron_api_cluster
      bind <Virtual IP>:9696
@@ -200,18 +200,18 @@ You need a copy of it on each controller node.
      option  tcpka
      option  httpchk
      option  tcplog
-     server controller1 10.0.0.1:9696 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:9696 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:9696 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:9696 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:9696 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:9696 check inter 2000 rise 2 fall 5
 
    listen swift_proxy_cluster
      bind <Virtual IP>:8080
      balance  source
      option  tcplog
      option  tcpka
-     server controller1 10.0.0.1:8080 check inter 2000 rise 2 fall 5
-     server controller2 10.0.0.2:8080 check inter 2000 rise 2 fall 5
-     server controller3 10.0.0.3:8080 check inter 2000 rise 2 fall 5
+     server controller1 10.0.0.12:8080 check inter 2000 rise 2 fall 5
+     server controller2 10.0.0.13:8080 check inter 2000 rise 2 fall 5
+     server controller3 10.0.0.14:8080 check inter 2000 rise 2 fall 5
 
 .. note::
 
diff --git a/doc/ha-guide/source/controller-ha-pacemaker.rst b/doc/ha-guide/source/controller-ha-pacemaker.rst
index 9d03210e..db1e4009 100644
--- a/doc/ha-guide/source/controller-ha-pacemaker.rst
+++ b/doc/ha-guide/source/controller-ha-pacemaker.rst
@@ -314,15 +314,20 @@ for unicastis shown below:
 
    nodelist { (3)
            node {
-                   ring0_addr: 10.0.0.1
-                   ring1_addr: 10.0.42.1
+                   ring0_addr: 10.0.0.12
+                   ring1_addr: 10.0.42.12
                    nodeid: 1
            }
            node {
-                   ring0_addr: 10.0.0.2
-                   ring1_addr: 10.0.42.2
+                   ring0_addr: 10.0.0.13
+                   ring1_addr: 10.0.42.13
                    nodeid: 2
            }
+           node {
+                   ring0_addr: 10.0.0.14
+                   ring1_addr: 10.0.42.14
+                   nodeid: 3
+           }
    }
    #...