[asterisk-scf-commits] asterisk-scf/release/testsuite.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu May 10 09:14:41 CDT 2012


branch "master" has been updated
       via  128e1ecbcab182ef00e62932c95236ea12e25043 (commit)
       via  242a44e8880343b0f6ba1dd8b88f668082f61422 (commit)
       via  bd0c610d82451aa0d9dc593f4e059d0bd20ddf89 (commit)
      from  637eec2498f1d2ddf1f28c413f7af472e4786ca2 (commit)

Summary of changes:
 configs/icebox/failover/BridgeManager.conf         |    6 ++--
 configs/icebox/failover/Logger.conf                |    4 +-
 configs/icebox/failover/MediaFormatGeneric.conf    |    6 ++--
 configs/icebox/failover/MediaOperationsCore.conf   |    6 ++--
 configs/icebox/failover/MediaServiceRTP.conf       |    6 ++--
 configs/icebox/failover/MediaTransportUDPTL.conf   |   26 ++++++++++++++++++++
 .../icebox/failover/MediaTransportUDPTLActive.conf |   25 +++++++++++++++++++
 .../failover/MediaTransportUDPTLStandby.conf       |   25 +++++++++++++++++++
 ...onf => MediaTransportUDPTLStateReplicator.conf} |   19 +++++++-------
 configs/icebox/failover/RoutingService.conf        |    8 +++---
 .../icebox/failover/RoutingStateReplicator.conf    |    7 ++++-
 configs/icebox/failover/SIPService.conf            |    6 ++--
 configs/icebox/failover/ServiceDiscovery.conf      |    3 ++
 .../icebox/failover/ServiceDiscoveryActive.conf    |    5 +++-
 .../icebox/failover/ServiceDiscoveryStandby.conf   |    5 +++-
 configs/icebox/failover/SipStateReplicator.conf    |    6 ++--
 configs/icebox/standalone/ServiceDiscovery.conf    |    3 ++
 configs/plugins/failover_conf.yaml                 |   16 ++++++------
 18 files changed, 137 insertions(+), 45 deletions(-)
 create mode 100644 configs/icebox/failover/MediaTransportUDPTL.conf
 create mode 100644 configs/icebox/failover/MediaTransportUDPTLActive.conf
 create mode 100644 configs/icebox/failover/MediaTransportUDPTLStandby.conf
 copy configs/icebox/failover/{MediaServiceRTPActive.conf => MediaTransportUDPTLStateReplicator.conf} (57%)


- Log -----------------------------------------------------------------
commit 128e1ecbcab182ef00e62932c95236ea12e25043
Author: Darren Sessions <dsessions at digium.com>
Date:   Thu May 10 09:14:12 2012 -0500

    Updated the failover plugin configuration file with the newly assigned block of dedicated IPs from IT.

diff --git a/configs/plugins/failover_conf.yaml b/configs/plugins/failover_conf.yaml
index 718bc60..79a07aa 100644
--- a/configs/plugins/failover_conf.yaml
+++ b/configs/plugins/failover_conf.yaml
@@ -5,35 +5,35 @@
 pools :
     failover_pool_1 :
         ipv4 :
-            - 10.19.139.44 :
+            - 10.19.136.15 :
                 network : 10.19.136.0
                 netmask : 255.255.252.0
                 broadcast : 10.19.139.255
-            - 10.19.139.45 :
+            - 10.19.136.16 :
                 network : 10.19.136.0
                 netmask : 255.255.252.0
                 broadcast : 10.19.139.255
-            - 10.19.139.46 :
+            - 10.19.136.17 :
                 network : 10.19.136.0
                 netmask : 255.255.252.0
                 broadcast : 10.19.139.255
-            - 10.19.139.47 :
+            - 10.19.136.18 :
                 network : 10.19.136.0
                 netmask : 255.255.252.0
                 broadcast : 10.19.139.255
-            - 10.19.139.48 :
+            - 10.19.136.19 :
                 network : 10.19.136.0
                 netmask : 255.255.252.0
                 broadcast : 10.19.139.255
-            - 10.19.139.49 :
+            - 10.19.136.20 :
                 network : 10.19.136.0
                 netmask : 255.255.252.0
                 broadcast : 10.19.139.255
-            - 10.19.139.50 : 
+            - 10.19.136.21 : 
                 network : 10.19.136.0
                 netmask : 255.255.252.0
                 broadcast : 10.19.139.255
-            - 10.19.139.51 :
+            - 10.19.136.22 :
                 network : 10.19.136.0
                 netmask : 255.255.252.0
                 broadcast : 10.19.139.255

commit 242a44e8880343b0f6ba1dd8b88f668082f61422
Author: Darren Sessions <dsessions at digium.com>
Date:   Thu May 10 09:13:17 2012 -0500

    Updated the standalone service discovery configuration to include mandatory parameters.

diff --git a/configs/icebox/standalone/ServiceDiscovery.conf b/configs/icebox/standalone/ServiceDiscovery.conf
index ed59ee2..ef13444 100644
--- a/configs/icebox/standalone/ServiceDiscovery.conf
+++ b/configs/icebox/standalone/ServiceDiscovery.conf
@@ -1,5 +1,6 @@
 IceBox.InheritProperties=1
 Ice.Default.CollocationOptimized=0
+Ice.ThreadPool.Client.Size=10
 IceBox.Service.ServiceDiscovery=ServiceLocator:create
 
 ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
@@ -16,3 +17,5 @@ ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4422:udp -p 4422
 ServiceDiscovery.IceStorm.Trace.TopicManager=2
 ServiceDiscovery.IceStorm.Transient=1
 ServiceDiscovery.IceStorm.Flush.Timeout=2000
+
+ServiceDiscovery.Standalone=yes

commit bd0c610d82451aa0d9dc593f4e059d0bd20ddf89
Author: Darren Sessions <dsessions at digium.com>
Date:   Thu May 10 09:12:13 2012 -0500

    Updated the failover icebox configuration files to include new component options and replaceable tags for use within the testsuite (for things like dynamic addresses).

diff --git a/configs/icebox/failover/BridgeManager.conf b/configs/icebox/failover/BridgeManager.conf
index a5fa508..fc8c5ed 100644
--- a/configs/icebox/failover/BridgeManager.conf
+++ b/configs/icebox/failover/BridgeManager.conf
@@ -21,9 +21,9 @@ BridgeManager.ServiceName=default
 BridgeManager.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
 BridgeManager.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/Logger.conf b/configs/icebox/failover/Logger.conf
index 8ef18a4..f65af9f 100644
--- a/configs/icebox/failover/Logger.conf
+++ b/configs/icebox/failover/Logger.conf
@@ -4,8 +4,8 @@ IceBox.Service.Logger=LoggingService:createLoggingService
 
 Logger.ServiceAdapter.Endpoints=tcp -p 4431
 
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/MediaFormatGeneric.conf b/configs/icebox/failover/MediaFormatGeneric.conf
index 9b097a9..357a638 100644
--- a/configs/icebox/failover/MediaFormatGeneric.conf
+++ b/configs/icebox/failover/MediaFormatGeneric.conf
@@ -18,9 +18,9 @@ MediaFormatGeneric.ServiceName=default
 MediaFormatGeneric.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
 MediaFormatGeneric.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/MediaOperationsCore.conf b/configs/icebox/failover/MediaOperationsCore.conf
index 6064809..bdf7656 100644
--- a/configs/icebox/failover/MediaOperationsCore.conf
+++ b/configs/icebox/failover/MediaOperationsCore.conf
@@ -18,9 +18,9 @@ MediaOperationsCore.ServiceName=default
 MediaOperationsCore.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
 MediaOperationsCore.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/MediaServiceRTP.conf b/configs/icebox/failover/MediaServiceRTP.conf
index 47a3c12..7535ec3 100644
--- a/configs/icebox/failover/MediaServiceRTP.conf
+++ b/configs/icebox/failover/MediaServiceRTP.conf
@@ -18,9 +18,9 @@ MediaServiceRTP.ServiceName=default
 MediaServiceRTP.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
 MediaServiceRTP.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/MediaTransportUDPTL.conf b/configs/icebox/failover/MediaTransportUDPTL.conf
new file mode 100644
index 0000000..48c1642
--- /dev/null
+++ b/configs/icebox/failover/MediaTransportUDPTL.conf
@@ -0,0 +1,26 @@
+#
+# MediaTransportUDPTL Configuration
+#
+IceBox.Service.MediaTransportUDPTL=MediaTransportUDPTL:create
+IceBox.InheritProperties=1
+
+Ice.Override.Timeout=5000
+
+# Adapter parameters for this component
+MediaTransportUDPTLAdapter.Endpoints=default 
+MediaTransportUDPTLAdapterLocal.Endpoints=default
+MediaTransportUDPTLAdapterLogger.Endpoints=default
+MediaTransportUDPTL.ServiceAdapter.Endpoints=default
+MediaTransportUDPTL.BackplaneAdapter.Endpoints=default
+
+MediaTransportUDPTL.Standalone=yes
+
+# A proxy to the service locator management service
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
+
+# A proxy to the service locator service
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+
+# this is used to connect to the IceStorm instance that lives in the same IceBox
+# container as the ServiceDiscovery service
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/MediaTransportUDPTLActive.conf b/configs/icebox/failover/MediaTransportUDPTLActive.conf
new file mode 100644
index 0000000..27cf11b
--- /dev/null
+++ b/configs/icebox/failover/MediaTransportUDPTLActive.conf
@@ -0,0 +1,25 @@
+#
+# MediaTransportUDPTL Configuration
+#
+IceBox.Service.MediaTransportUDPTLActive=MediaTransportUDPTL:create
+IceBox.InheritProperties=1
+
+Ice.Override.Timeout=5000
+
+# Adapter parameters for this component
+#MediaTransportUDPTLAdapter.Endpoints=default 
+#MediaTransportUDPTLAdapterLocal.Endpoints=default
+#MediaTransportUDPTLAdapterLogger.Endpoints=default
+
+MediaTransportUDPTLActive.ServiceAdapter.Endpoints=default
+MediaTransportUDPTLActive.BackplaneAdapter.Endpoints=default
+
+# A proxy to the service locator management service
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
+
+# A proxy to the service locator service
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+
+# this is used to connect to the IceStorm instance that lives in the same IceBox
+# container as the ServiceDiscovery service
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/MediaTransportUDPTLStandby.conf b/configs/icebox/failover/MediaTransportUDPTLStandby.conf
new file mode 100644
index 0000000..7afae79
--- /dev/null
+++ b/configs/icebox/failover/MediaTransportUDPTLStandby.conf
@@ -0,0 +1,25 @@
+#
+# MediaTransportUDPTL Configuration
+#
+IceBox.Service.MediaTransportUDPTLStandby=MediaTransportUDPTL:create
+IceBox.InheritProperties=1
+
+Ice.Override.Timeout=5000
+
+# Adapter parameters for this component
+MediaTransportUDPTLAdapter.Endpoints=default 
+MediaTransportUDPTLAdapterLocal.Endpoints=default
+MediaTransportUDPTLAdapterLogger.Endpoints=default
+
+MediaTransportUDPTLStandby.ServiceAdapter.Endpoints=default
+MediaTransportUDPTLStandby.BackplaneAdapter.Endpoints=default
+
+# A proxy to the service locator management service
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
+
+# A proxy to the service locator service
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+
+# this is used to connect to the IceStorm instance that lives in the same IceBox
+# container as the ServiceDiscovery service
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/MediaTransportUDPTLStateReplicator.conf b/configs/icebox/failover/MediaTransportUDPTLStateReplicator.conf
new file mode 100644
index 0000000..e31de0d
--- /dev/null
+++ b/configs/icebox/failover/MediaTransportUDPTLStateReplicator.conf
@@ -0,0 +1,27 @@
+IceBox.InheritProperties=1
+Ice.Default.CollocationOptimized=0
+# this value was empirically determined... it may need to be different on different systems
+Ice.ThreadPool.Client.Size=10
+IceBox.Service.UDPTLStateReplicator=UDPTLStateReplicator:create
+
+UDPTLStateReplicator.Adapter.ThreadPool.Size=4
+UDPTLStateReplicator.Adapter.Endpoints=tcp -p 4489
+
+# this service name property is used when registering this component's 
+# services with the ServiceLocator. services are registered with
+# a Category, Service, and Instance.
+UDPTLStateReplicator.ServiceName=default
+
+UDPTLStateReplicator.IceStorm.InstanceName=UDPTLStateReplicator
+UDPTLStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10005
+UDPTLStateReplicator.IceStorm.Publish.Endpoints=default -p 10006
+UDPTLStateReplicator.IceStorm.Trace.TopicManager=2
+UDPTLStateReplicator.IceStorm.Transient=1
+UDPTLStateReplicator.IceStorm.Flush.Timeout=2000
+
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
+
+# this is used to connect to the IceStorm instance that lives in the same IceBox
+# container as the ServiceDiscovery service
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/RoutingService.conf b/configs/icebox/failover/RoutingService.conf
index 3def0e9..b1b0b0d 100644
--- a/configs/icebox/failover/RoutingService.conf
+++ b/configs/icebox/failover/RoutingService.conf
@@ -25,10 +25,10 @@ RoutingService.BridgeServiceName=default
 RoutingService.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
 RoutingService.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
-
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
+ 
diff --git a/configs/icebox/failover/RoutingStateReplicator.conf b/configs/icebox/failover/RoutingStateReplicator.conf
index 8084b2f..12aa611 100644
--- a/configs/icebox/failover/RoutingStateReplicator.conf
+++ b/configs/icebox/failover/RoutingStateReplicator.conf
@@ -13,6 +13,9 @@ RoutingStateReplicator.Adapter.Endpoints=tcp -p 4459
 # a Category, Service, and Instance.
 RoutingStateReplicator.ServiceName=default
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
+# this is used to connect to the IceStorm instance that lives in the same IceBox
+# container as the ServiceDiscovery service
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/SIPService.conf b/configs/icebox/failover/SIPService.conf
index a0f3790..5d6f7ec 100644
--- a/configs/icebox/failover/SIPService.conf
+++ b/configs/icebox/failover/SIPService.conf
@@ -26,9 +26,9 @@ SIPServiceActive.SIP.Modules=Session Logging Registrar
 SIPServiceActive.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
 SIPServiceActive.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/ServiceDiscovery.conf b/configs/icebox/failover/ServiceDiscovery.conf
index ed59ee2..ef13444 100644
--- a/configs/icebox/failover/ServiceDiscovery.conf
+++ b/configs/icebox/failover/ServiceDiscovery.conf
@@ -1,5 +1,6 @@
 IceBox.InheritProperties=1
 Ice.Default.CollocationOptimized=0
+Ice.ThreadPool.Client.Size=10
 IceBox.Service.ServiceDiscovery=ServiceLocator:create
 
 ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
@@ -16,3 +17,5 @@ ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4422:udp -p 4422
 ServiceDiscovery.IceStorm.Trace.TopicManager=2
 ServiceDiscovery.IceStorm.Transient=1
 ServiceDiscovery.IceStorm.Flush.Timeout=2000
+
+ServiceDiscovery.Standalone=yes
diff --git a/configs/icebox/failover/ServiceDiscoveryActive.conf b/configs/icebox/failover/ServiceDiscoveryActive.conf
index 3f4fdb1..b7aa719 100644
--- a/configs/icebox/failover/ServiceDiscoveryActive.conf
+++ b/configs/icebox/failover/ServiceDiscoveryActive.conf
@@ -1,8 +1,9 @@
 IceBox.InheritProperties=1
 Ice.Default.CollocationOptimized=0
+Ice.ThreadPool.Client.Size=10
 IceBox.Service.ServiceDiscoveryActive=ServiceLocator:create
 
-ServiceDiscoveryActive.BackplaneAdapter.Endpoints=tcp -p 4410 !!PRIVATE!!
+ServiceDiscoveryActive.BackplaneAdapter.Endpoints=tcp -p 4410 !!PUBLIC!!
 ServiceDiscoveryActive.Management.ServiceAdapter.Endpoints=tcp -p 4412 !!PUBLIC!!
 ServiceDiscoveryActive.Locator.ServiceAdapter.Endpoints=tcp -p 4411 !!PUBLIC!!
 ServiceDiscoveryActive.IceStorm.InstanceName=ServiceDiscovery
@@ -16,3 +17,5 @@ ServiceDiscoveryActive.IceStorm.Publish.Endpoints=tcp -p 4422:udp -p 4422 !!PUBL
 ServiceDiscoveryActive.IceStorm.Trace.TopicManager=2
 ServiceDiscoveryActive.IceStorm.Transient=1
 ServiceDiscoveryActive.IceStorm.Flush.Timeout=2000
+
+ServiceDiscoveryActive.StateReplicator.Proxy=ServiceLocatorStateReplicatorService:tcp -p 4419 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/ServiceDiscoveryStandby.conf b/configs/icebox/failover/ServiceDiscoveryStandby.conf
index 0949b98..45fcdfb 100644
--- a/configs/icebox/failover/ServiceDiscoveryStandby.conf
+++ b/configs/icebox/failover/ServiceDiscoveryStandby.conf
@@ -1,8 +1,9 @@
 IceBox.InheritProperties=1
 Ice.Default.CollocationOptimized=0
+Ice.ThreadPool.Client.Size=10
 IceBox.Service.ServiceDiscoveryStandby=ServiceLocator:create
 
-ServiceDiscoveryStandby.BackplaneAdapter.Endpoints=tcp -p 4410 !!PRIVATE!!
+ServiceDiscoveryStandby.BackplaneAdapter.Endpoints=tcp -p 4410 !!PUBLIC!!
 ServiceDiscoveryStandby.Management.ServiceAdapter.Endpoints=tcp -p 4412 !!PUBLIC!!
 ServiceDiscoveryStandby.Locator.ServiceAdapter.Endpoints=tcp -p 4411 !!PUBLIC!!
 ServiceDiscoveryStandby.IceStorm.InstanceName=ServiceDiscovery
@@ -16,3 +17,5 @@ ServiceDiscoveryStandby.IceStorm.Publish.Endpoints=tcp -p 4422:udp -p 4422 !!PUB
 ServiceDiscoveryStandby.IceStorm.Trace.TopicManager=2
 ServiceDiscoveryStandby.IceStorm.Transient=1
 ServiceDiscoveryStandby.IceStorm.Flush.Timeout=2000
+
+ServiceDiscoveryStandby.StateReplicator.Proxy=ServiceLocatorStateReplicatorService:tcp -p 4419 !!SERVICELOCATOR!!
diff --git a/configs/icebox/failover/SipStateReplicator.conf b/configs/icebox/failover/SipStateReplicator.conf
index 0fb0b4c..a5584e0 100644
--- a/configs/icebox/failover/SipStateReplicator.conf
+++ b/configs/icebox/failover/SipStateReplicator.conf
@@ -22,9 +22,9 @@ SIPStateReplicator.IceStorm.Flush.Timeout=2000
 # a Category, Service, and Instance.
 SIPStateReplicator.ServiceName=default
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -p 4411 !!SERVICELOCATOR!!
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412 !!SERVICELOCATOR!!
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421 !!SERVICELOCATOR!!

-----------------------------------------------------------------------


-- 
asterisk-scf/release/testsuite.git



More information about the asterisk-scf-commits mailing list