Arranged the config so that its obvious how to enable the ClusteredDataStoreProvider

Change-Id: I076835c4a95571efafa9ecc4242a2e85a4717fa2
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf
index 07c21261bb4d9fad5d4ecbd002119a07d2f0163b..430a278a6061b332e885df89094b3ac4271b7ac8 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf
@@ -7,12 +7,18 @@
                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:hash-map-data-store</type>
                <name>hash-map-data-store</name>
        </module>
                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:hash-map-data-store</type>
                <name>hash-map-data-store</name>
        </module>

+       <module>
+        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:cluster:store">prefix:dom-clustered-store-impl</type>
+        <name>cluster-data-store</name>
+    </module>

        <module>
                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:dom-broker-impl</type>
                <name>dom-broker</name>
                <data-store xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">
                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-data-store</type>
        <module>
                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:dom-broker-impl</type>
                <name>dom-broker</name>
                <data-store xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">
                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-data-store</type>

-                       <name>ref_hash-map-data-store</name>
+            <!-- to switch to the clustered data store, comment out the ref_hash-map-data-store <name> and uncomment the ref_cluster-data-store one -->
+            <name>ref_hash-map-data-store</name>
+            <!-- <name>ref_cluster-data-store</name> -->

                </data-store>
        </module>
        <module>
                </data-store>
        </module>
        <module>


@@ -68,6 +74,10 @@
                        <name>ref_hash-map-data-store</name>
                        <provider>/config/modules/module[name='hash-map-data-store']/instance[name='hash-map-data-store']</provider>
                </instance>
                        <name>ref_hash-map-data-store</name>
                        <provider>/config/modules/module[name='hash-map-data-store']/instance[name='hash-map-data-store']</provider>
                </instance>

+               <instance>
+            <name>ref_cluster-data-store</name>
+            <provider>/config/modules/module[name='dom-clustered-store-impl']/instance[name='cluster-data-store']</provider>
+        </instance>

        </service>
        <service>
                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
        </service>
        <service>
                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>


@@ -124,3 +134,4 @@ urn:opendaylight:yang:extension:yang-ext?module=yang-ext&revision=2013-07-09
 urn:opendaylight:params:xml:ns:yang:iana?module=iana&revision=2013-08-16
 urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&revision=2013-10-28
 urn:opendaylight:params:xml:ns:yang:ieee754?module=ieee754&revision=2013-08-19
 urn:opendaylight:params:xml:ns:yang:iana?module=iana&revision=2013-08-16
 urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&revision=2013-10-28
 urn:opendaylight:params:xml:ns:yang:ieee754?module=ieee754&revision=2013-08-19

+urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:cluster:store?module=odl-sal-dom-clustered-store-cfg&revision=2013-10-28