Update SAIO & docker image to use 62xx ports

Note that existing SAIOs with 60xx ports should still work fine.

Change-Id: If5dd79f926fa51a58b3a732b212b484a7e9f00db
Related-Change: Ie1c778b159792c8e259e2a54cb86051686ac9d18

14 files changed, 60 insertions, 60 deletions

diff --git a/doc/saio/bin/remakerings b/doc/saio/bin/remakerings
index bd7dd4926..0d67b6b4c 100755
--- a/doc/saio/bin/remakerings
+++ b/doc/saio/bin/remakerings
@@ -7,36 +7,36 @@ cd /etc/swift
 rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz
 
 swift-ring-builder object.builder create 10 3 1
-swift-ring-builder object.builder add r1z1-127.0.0.1:6010/sdb1 1
-swift-ring-builder object.builder add r1z2-127.0.0.2:6020/sdb2 1
-swift-ring-builder object.builder add r1z3-127.0.0.3:6030/sdb3 1
-swift-ring-builder object.builder add r1z4-127.0.0.4:6040/sdb4 1
+swift-ring-builder object.builder add r1z1-127.0.0.1:6210/sdb1 1
+swift-ring-builder object.builder add r1z2-127.0.0.2:6220/sdb2 1
+swift-ring-builder object.builder add r1z3-127.0.0.3:6230/sdb3 1
+swift-ring-builder object.builder add r1z4-127.0.0.4:6240/sdb4 1
 swift-ring-builder object.builder rebalance
 swift-ring-builder object-1.builder create 10 2 1
-swift-ring-builder object-1.builder add r1z1-127.0.0.1:6010/sdb1 1
-swift-ring-builder object-1.builder add r1z2-127.0.0.2:6020/sdb2 1
-swift-ring-builder object-1.builder add r1z3-127.0.0.3:6030/sdb3 1
-swift-ring-builder object-1.builder add r1z4-127.0.0.4:6040/sdb4 1
+swift-ring-builder object-1.builder add r1z1-127.0.0.1:6210/sdb1 1
+swift-ring-builder object-1.builder add r1z2-127.0.0.2:6220/sdb2 1
+swift-ring-builder object-1.builder add r1z3-127.0.0.3:6230/sdb3 1
+swift-ring-builder object-1.builder add r1z4-127.0.0.4:6240/sdb4 1
 swift-ring-builder object-1.builder rebalance
 swift-ring-builder object-2.builder create 10 6 1
-swift-ring-builder object-2.builder add r1z1-127.0.0.1:6010/sdb1 1
-swift-ring-builder object-2.builder add r1z1-127.0.0.1:6010/sdb5 1
-swift-ring-builder object-2.builder add r1z2-127.0.0.2:6020/sdb2 1
-swift-ring-builder object-2.builder add r1z2-127.0.0.2:6020/sdb6 1
-swift-ring-builder object-2.builder add r1z3-127.0.0.3:6030/sdb3 1
-swift-ring-builder object-2.builder add r1z3-127.0.0.3:6030/sdb7 1
-swift-ring-builder object-2.builder add r1z4-127.0.0.4:6040/sdb4 1
-swift-ring-builder object-2.builder add r1z4-127.0.0.4:6040/sdb8 1
+swift-ring-builder object-2.builder add r1z1-127.0.0.1:6210/sdb1 1
+swift-ring-builder object-2.builder add r1z1-127.0.0.1:6210/sdb5 1
+swift-ring-builder object-2.builder add r1z2-127.0.0.2:6220/sdb2 1
+swift-ring-builder object-2.builder add r1z2-127.0.0.2:6220/sdb6 1
+swift-ring-builder object-2.builder add r1z3-127.0.0.3:6230/sdb3 1
+swift-ring-builder object-2.builder add r1z3-127.0.0.3:6230/sdb7 1
+swift-ring-builder object-2.builder add r1z4-127.0.0.4:6240/sdb4 1
+swift-ring-builder object-2.builder add r1z4-127.0.0.4:6240/sdb8 1
 swift-ring-builder object-2.builder rebalance
 swift-ring-builder container.builder create 10 3 1
-swift-ring-builder container.builder add r1z1-127.0.0.1:6011/sdb1 1
-swift-ring-builder container.builder add r1z2-127.0.0.2:6021/sdb2 1
-swift-ring-builder container.builder add r1z3-127.0.0.3:6031/sdb3 1
-swift-ring-builder container.builder add r1z4-127.0.0.4:6041/sdb4 1
+swift-ring-builder container.builder add r1z1-127.0.0.1:6211/sdb1 1
+swift-ring-builder container.builder add r1z2-127.0.0.2:6221/sdb2 1
+swift-ring-builder container.builder add r1z3-127.0.0.3:6231/sdb3 1
+swift-ring-builder container.builder add r1z4-127.0.0.4:6241/sdb4 1
 swift-ring-builder container.builder rebalance
 swift-ring-builder account.builder create 10 3 1
-swift-ring-builder account.builder add r1z1-127.0.0.1:6012/sdb1 1
-swift-ring-builder account.builder add r1z2-127.0.0.2:6022/sdb2 1
-swift-ring-builder account.builder add r1z3-127.0.0.3:6032/sdb3 1
-swift-ring-builder account.builder add r1z4-127.0.0.4:6042/sdb4 1
+swift-ring-builder account.builder add r1z1-127.0.0.1:6212/sdb1 1
+swift-ring-builder account.builder add r1z2-127.0.0.2:6222/sdb2 1
+swift-ring-builder account.builder add r1z3-127.0.0.3:6232/sdb3 1
+swift-ring-builder account.builder add r1z4-127.0.0.4:6242/sdb4 1
 swift-ring-builder account.builder rebalance
diff --git a/doc/saio/rsyncd.conf b/doc/saio/rsyncd.conf
index 0ed8dd663..28aca5a59 100644
--- a/doc/saio/rsyncd.conf
+++ b/doc/saio/rsyncd.conf
@@ -4,74 +4,74 @@ log file = /var/log/rsyncd.log
 pid file = /var/run/rsyncd.pid
 address = 0.0.0.0
 
-[account6012]
+[account6212]
 max connections = 25
 path = /srv/1/node/
 read only = false
-lock file = /var/lock/account6012.lock
+lock file = /var/lock/account6212.lock
 
-[account6022]
+[account6222]
 max connections = 25
 path = /srv/2/node/
 read only = false
-lock file = /var/lock/account6022.lock
+lock file = /var/lock/account6222.lock
 
-[account6032]
+[account6232]
 max connections = 25
 path = /srv/3/node/
 read only = false
-lock file = /var/lock/account6032.lock
+lock file = /var/lock/account6232.lock
 
-[account6042]
+[account6242]
 max connections = 25
 path = /srv/4/node/
 read only = false
-lock file = /var/lock/account6042.lock
+lock file = /var/lock/account6242.lock
 
-[container6011]
+[container6211]
 max connections = 25
 path = /srv/1/node/
 read only = false
-lock file = /var/lock/container6011.lock
+lock file = /var/lock/container6211.lock
 
-[container6021]
+[container6221]
 max connections = 25
 path = /srv/2/node/
 read only = false
-lock file = /var/lock/container6021.lock
+lock file = /var/lock/container6221.lock
 
-[container6031]
+[container6231]
 max connections = 25
 path = /srv/3/node/
 read only = false
-lock file = /var/lock/container6031.lock
+lock file = /var/lock/container6231.lock
 
-[container6041]
+[container6241]
 max connections = 25
 path = /srv/4/node/
 read only = false
-lock file = /var/lock/container6041.lock
+lock file = /var/lock/container6241.lock
 
-[object6010]
+[object6210]
 max connections = 25
 path = /srv/1/node/
 read only = false
-lock file = /var/lock/object6010.lock
+lock file = /var/lock/object6210.lock
 
-[object6020]
+[object6220]
 max connections = 25
 path = /srv/2/node/
 read only = false
-lock file = /var/lock/object6020.lock
+lock file = /var/lock/object6220.lock
 
-[object6030]
+[object6230]
 max connections = 25
 path = /srv/3/node/
 read only = false
-lock file = /var/lock/object6030.lock
+lock file = /var/lock/object6230.lock
 
-[object6040]
+[object6240]
 max connections = 25
 path = /srv/4/node/
 read only = false
-lock file = /var/lock/object6040.lock
+lock file = /var/lock/object6240.lock
diff --git a/doc/saio/swift/account-server/1.conf b/doc/saio/swift/account-server/1.conf
index 4bdc05ed6..e405f2de4 100644
--- a/doc/saio/swift/account-server/1.conf
+++ b/doc/saio/swift/account-server/1.conf
@@ -3,7 +3,7 @@ devices = /srv/1/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.1
-bind_port = 6012
+bind_port = 6212
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL2
diff --git a/doc/saio/swift/account-server/2.conf b/doc/saio/swift/account-server/2.conf
index 087b7fb7a..9b580566e 100644
--- a/doc/saio/swift/account-server/2.conf
+++ b/doc/saio/swift/account-server/2.conf
@@ -3,7 +3,7 @@ devices = /srv/2/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.2
-bind_port = 6022
+bind_port = 6222
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL3
diff --git a/doc/saio/swift/account-server/3.conf b/doc/saio/swift/account-server/3.conf
index 678209abc..c0cbe6e33 100644
--- a/doc/saio/swift/account-server/3.conf
+++ b/doc/saio/swift/account-server/3.conf
@@ -3,7 +3,7 @@ devices = /srv/3/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.3
-bind_port = 6032
+bind_port = 6232
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL4
diff --git a/doc/saio/swift/account-server/4.conf b/doc/saio/swift/account-server/4.conf
index b14c4f81a..105d0eec1 100644
--- a/doc/saio/swift/account-server/4.conf
+++ b/doc/saio/swift/account-server/4.conf
@@ -3,7 +3,7 @@ devices = /srv/4/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.4
-bind_port = 6042
+bind_port = 6242
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL5
diff --git a/doc/saio/swift/container-server/1.conf b/doc/saio/swift/container-server/1.conf
index 072594c92..af03ac8e3 100644
--- a/doc/saio/swift/container-server/1.conf
+++ b/doc/saio/swift/container-server/1.conf
@@ -3,7 +3,7 @@ devices = /srv/1/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.1
-bind_port = 6011
+bind_port = 6211
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL2
diff --git a/doc/saio/swift/container-server/2.conf b/doc/saio/swift/container-server/2.conf
index 78c3d206b..fe20c6d2c 100644
--- a/doc/saio/swift/container-server/2.conf
+++ b/doc/saio/swift/container-server/2.conf
@@ -3,7 +3,7 @@ devices = /srv/2/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.2
-bind_port = 6021
+bind_port = 6221
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL3
diff --git a/doc/saio/swift/container-server/3.conf b/doc/saio/swift/container-server/3.conf
index d4de73a92..a6960ba06 100644
--- a/doc/saio/swift/container-server/3.conf
+++ b/doc/saio/swift/container-server/3.conf
@@ -3,7 +3,7 @@ devices = /srv/3/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.3
-bind_port = 6031
+bind_port = 6231
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL4
diff --git a/doc/saio/swift/container-server/4.conf b/doc/saio/swift/container-server/4.conf
index d644ff29e..35c0a528f 100644
--- a/doc/saio/swift/container-server/4.conf
+++ b/doc/saio/swift/container-server/4.conf
@@ -3,7 +3,7 @@ devices = /srv/4/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.4
-bind_port = 6041
+bind_port = 6241
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL5
diff --git a/doc/saio/swift/object-server/1.conf b/doc/saio/swift/object-server/1.conf
index 243722394..7405dddf9 100644
--- a/doc/saio/swift/object-server/1.conf
+++ b/doc/saio/swift/object-server/1.conf
@@ -3,7 +3,7 @@ devices = /srv/1/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.1
-bind_port = 6010
+bind_port = 6210
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL2
diff --git a/doc/saio/swift/object-server/2.conf b/doc/saio/swift/object-server/2.conf
index 647afda41..2b6bc0358 100644
--- a/doc/saio/swift/object-server/2.conf
+++ b/doc/saio/swift/object-server/2.conf
@@ -3,7 +3,7 @@ devices = /srv/2/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.2
-bind_port = 6020
+bind_port = 6220
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL3
diff --git a/doc/saio/swift/object-server/3.conf b/doc/saio/swift/object-server/3.conf
index 563025761..6ef04ee59 100644
--- a/doc/saio/swift/object-server/3.conf
+++ b/doc/saio/swift/object-server/3.conf
@@ -3,7 +3,7 @@ devices = /srv/3/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.3
-bind_port = 6030
+bind_port = 6230
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL4
diff --git a/doc/saio/swift/object-server/4.conf b/doc/saio/swift/object-server/4.conf
index 0ab17690d..3fbf83c6f 100644
--- a/doc/saio/swift/object-server/4.conf
+++ b/doc/saio/swift/object-server/4.conf
@@ -3,7 +3,7 @@ devices = /srv/4/node
 mount_check = false
 disable_fallocate = true
 bind_ip = 127.0.0.4
-bind_port = 6040
+bind_port = 6240
 workers = 1
 user = <your-user-name>
 log_facility = LOG_LOCAL5