Move cluster-deployer to a shared clustering directory.

Change-Id: I4aeaef2bc07ba14272c96c55e4c8d0ab5018eeb9
Signed-off-by: Phillip Shea <phillip.shea@hp.com>

diff --git a/test/tools/cluster-deployer/deploy.py b/test/tools/clustering/cluster-deployer/deploy.py
similarity index 100%
rename from test/tools/cluster-deployer/deploy.py
rename to test/tools/clustering/cluster-deployer/deploy.py

diff --git a/test/tools/cluster-deployer/remote_host.py b/test/tools/clustering/cluster-deployer/remote_host.py
similarity index 100%
rename from test/tools/cluster-deployer/remote_host.py
rename to test/tools/clustering/cluster-deployer/remote_host.py

diff --git a/test/tools/cluster-deployer/restart.py b/test/tools/clustering/cluster-deployer/restart.py
similarity index 100%
rename from test/tools/cluster-deployer/restart.py
rename to test/tools/clustering/cluster-deployer/restart.py

diff --git a/test/tools/cluster-deployer/temp/README b/test/tools/clustering/cluster-deployer/temp/README
similarity index 100%
rename from test/tools/cluster-deployer/temp/README
rename to test/tools/clustering/cluster-deployer/temp/README

diff --git a/test/tools/cluster-deployer/templates/multi-node-test/akka.conf.template b/test/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/multi-node-test/akka.conf.template
rename to test/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template

diff --git a/test/tools/cluster-deployer/templates/multi-node-test/jolokia.xml.template b/test/tools/clustering/cluster-deployer/templates/multi-node-test/jolokia.xml.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/multi-node-test/jolokia.xml.template
rename to test/tools/clustering/cluster-deployer/templates/multi-node-test/jolokia.xml.template

diff --git a/test/tools/cluster-deployer/templates/multi-node-test/module-shards.conf.template b/test/tools/clustering/cluster-deployer/templates/multi-node-test/module-shards.conf.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/multi-node-test/module-shards.conf.template
rename to test/tools/clustering/cluster-deployer/templates/multi-node-test/module-shards.conf.template

diff --git a/test/tools/cluster-deployer/templates/multi-node-test/modules.conf.template b/test/tools/clustering/cluster-deployer/templates/multi-node-test/modules.conf.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/multi-node-test/modules.conf.template
rename to test/tools/clustering/cluster-deployer/templates/multi-node-test/modules.conf.template

diff --git a/test/tools/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template b/test/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template
rename to test/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template

diff --git a/test/tools/cluster-deployer/templates/multi-node-test/org.apache.karaf.management.cfg.template b/test/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.management.cfg.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/multi-node-test/org.apache.karaf.management.cfg.template
rename to test/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.management.cfg.template

diff --git a/test/tools/cluster-deployer/templates/openflow/akka.conf.template b/test/tools/clustering/cluster-deployer/templates/openflow/akka.conf.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/openflow/akka.conf.template
rename to test/tools/clustering/cluster-deployer/templates/openflow/akka.conf.template

diff --git a/test/tools/cluster-deployer/templates/openflow/jolokia.xml.template b/test/tools/clustering/cluster-deployer/templates/openflow/jolokia.xml.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/openflow/jolokia.xml.template
rename to test/tools/clustering/cluster-deployer/templates/openflow/jolokia.xml.template

diff --git a/test/tools/cluster-deployer/templates/openflow/module-shards.conf.template b/test/tools/clustering/cluster-deployer/templates/openflow/module-shards.conf.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/openflow/module-shards.conf.template
rename to test/tools/clustering/cluster-deployer/templates/openflow/module-shards.conf.template

diff --git a/test/tools/cluster-deployer/templates/openflow/modules.conf.template b/test/tools/clustering/cluster-deployer/templates/openflow/modules.conf.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/openflow/modules.conf.template
rename to test/tools/clustering/cluster-deployer/templates/openflow/modules.conf.template

diff --git a/test/tools/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template b/test/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template
rename to test/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template

diff --git a/test/tools/cluster-deployer/templates/openflow/org.apache.karaf.management.cfg.template b/test/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.management.cfg.template
similarity index 100%
rename from test/tools/cluster-deployer/templates/openflow/org.apache.karaf.management.cfg.template
rename to test/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.management.cfg.template