X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-config%2Fsrc%2Fmain%2Fresources%2Finitial%2F05-clustering.xml.conf;h=30efc610383d9ead097bdd925acd5fcca9a6601e;hp=89cd033df3ac41a5e5b105dbca4f8074eb47e586;hb=b3e258b9dc01140ce670cf24c5d614a2f18f9b63;hpb=58b7b56639e983e6fecdaff9508b9f0fd9afb514

diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
index 89cd033df3..30efc61038 100644
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
@@ -6,6 +6,10 @@
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
+
+ NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept
+       for backward compatibility and runtime modifications will not be honored. In
+       addition, this file is overwritten on feature re-install.
 -->
 <snapshot>
     <configuration>
@@ -31,6 +35,11 @@
                     </operational-data-store>
                 </module>
 
+                <module>
+                    <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:impl">as:actor-system-provider-impl</type>
+                    <name>actor-system-provider-impl</name>
+                </module>
+
                 <module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider">prefix:distributed-operational-datastore-provider</type>
                     <name>distributed-operational-store-module</name>
@@ -38,8 +47,13 @@
                         <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
                         <name>yang-schema-service</name>
                     </operational-schema-service>
+                    <operational-actor-system-provider>
+                        <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service">as:actor-system-provider-service</type>
+                        <name>actor-system-provider</name>
+                    </operational-actor-system-provider>
                     <operational-properties>
                         <persistent>false</persistent>
+                        <shard-election-timeout-factor>20</shard-election-timeout-factor>
                     </operational-properties>
                 </module>
 
@@ -50,24 +64,25 @@
                         <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
                         <name>yang-schema-service</name>
                     </config-schema-service>
+                    <config-actor-system-provider>
+                        <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service">as:actor-system-provider-service</type>
+                        <name>actor-system-provider</name>
+                    </config-actor-system-provider>
+                    <config-properties>
+                        <shard-election-timeout-factor>20</shard-election-timeout-factor>
+                    </config-properties>
                 </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">prefix:remote-rpc-connector</type>
-                    <name>remote-rpc-connector</name>
-                    <dom-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                        <name>dom-broker</name>
-                    </dom-broker>
-                    <enable-metric-capture xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">true</enable-metric-capture>
-                    <actor-system-name xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">odl-cluster-rpc</actor-system-name>
-                    <bounded-mailbox-capacity xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">1000</bounded-mailbox-capacity>
-                </module>
-
             </modules>
 
             <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
 
+                <service>
+                    <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service">as:actor-system-provider-service</type>
+                    <instance>
+                        <name>actor-system-provider</name>
+                        <provider>/modules/module[type='actor-system-provider-impl'][name='actor-system-provider-impl']</provider>
+                    </instance>
+                </service>
                 <service>
                     <type xmlns:config-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store">config-dom-store-spi:config-dom-datastore</type>
                     <instance>
@@ -97,9 +112,12 @@
     </configuration>
     <required-capabilities>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:config:concurrent-data-broker?module=odl-concurrent-data-broker-cfg&amp;revision=2014-11-24</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider?module=distributed-datastore-privider&amp;revision=2014-06-12</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service?module=actor-system-provider-service&amp;revision=2015-10-05</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:impl?module=actor-system-provider-impl&amp;revision=2015-10-05</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider?module=distributed-datastore-provider&amp;revision=2014-06-12</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store?module=opendaylight-config-dom-datastore&amp;revision=2014-06-17</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store?module=opendaylight-operational-dom-datastore&amp;revision=2014-06-17</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&amp;revision=2013-10-28</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
     </required-capabilities>
 </snapshot>