Clean up initial configuration

This removes the empty logging configuration, adds the global netty
configuration block, which can be reused by other components and renames
the files such that their names tell us what is it they are doing.

Change-Id: I6b7a9a75dbb376acdf17d7499a7c392acee9f491
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf
new file mode 100644 (file)
index 0000000..ffee9c6
--- /dev/null
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf
@@ -0,0 +1,48 @@
+//MODULES START
+       <module>
+               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup">netty:netty-threadgroup-fixed</type>
+               <name>global-boss-group</name>
+       </module>
+       <module>
+               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup">netty:netty-threadgroup-fixed</type>
+               <name>global-worker-group</name>
+       </module>
+       <module>
+               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty:timer">netty:netty-hashed-wheel-timer</type>
+               <name>global-timer</name>
+       </module>
+       <module>
+               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor">netty:netty-global-event-executor</type>
+               <name>global-event-executor</name>
+       </module>
+//SERVICES START
+       <service>
+               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
+               <instance>
+                       <name>global-boss-group</name>
+                       <provider>/config/modules/module[name='netty-threadgroup-fixed']/instance[name='global-boss-group']</provider>
+               </instance>
+               <instance>
+                       <name>global-worker-group</name>
+                       <provider>/config/modules/module[name='netty-threadgroup-fixed']/instance[name='global-worker-group']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-event-executor</type>
+               <instance>
+                       <name>global-event-executor</name>
+                       <provider>/config/modules/module[name='netty-global-eventexecutor']/instance[name='global-event-executor']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
+               <instance>
+                       <name>global-timer</name>
+                       <provider>/config/modules/module[name='netty-hashed-wheel-timer']/instance[name='global-timer']</provider>
+               </instance>
+       </service>
+//CAPABILITIES START
+urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19
+urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor?module=netty-event-executor&revision=2013-11-12
+urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup?module=threadgroup&revision=2013-11-07
+urn:opendaylight:params:xml:ns:yang:controller:netty:timer?module=netty-timer&revision=2013-11-19

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.2.txt b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf
similarity index 100%
rename from opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.2.txt
rename to opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.1.txt b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.1.txt
deleted file mode 100644 (file)
index 689b45a..0000000
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-//MODULES START
-//SERVICES START
-
-//CAPABILITIES START
-urn:opendaylight:params:xml:ns:yang:controller:logback:config?module=config-logging&revision=2013-07-16