modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 11 ++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
New commits: commit 4ff4a622549e441fd9c7947a41555789caca9357 Author: John Sanda jsanda@redhat.com Date: Wed Aug 21 07:43:43 2013 -0400
add support for disabling auto deployment
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index e626dc6..4668d85 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -186,7 +186,15 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN if (log.isInfoEnabled()) { log.info("Scheduling cluster maintenance to deploy " + storageNode + " into the storage cluster..."); } - deployStorageNode(subjectManager.getOverlord(), storageNode); + StorageClusterSettings clusterSettings = storageClusterSettingsManager.getClusterSettings( + subjectManager.getOverlord()); + if (clusterSettings.getAutomaticDeployment()) { + log.info("Deploying " + storageNode); + deployStorageNode(subjectManager.getOverlord(), storageNode); + } else { + log.info("Automatic deployment is disabled. " + storageNode + " will not become part of the " + + "cluster until it is deployed."); + } } } catch (UnknownHostException e) { throw new RuntimeException("Could not resolve address [" + address + "]. The resource " + resource + @@ -216,7 +224,6 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN clusterSettings = new StorageClusterSettings(); clusterSettings.setCqlPort(Integer.parseInt(pluginConfig.getSimpleValue(RHQ_STORAGE_CQL_PORT_PROPERTY))); clusterSettings.setGossipPort(Integer.parseInt(pluginConfig.getSimpleValue(RHQ_STORAGE_GOSSIP_PORT_PROPERTY))); -// clusterSettings.setAutomaticDeployment(Boolean.parseBoolean(pluginConfig.getSimpleValue(RHQ_STORAGE_GOSSIP_PORT_PROPERTY))); storageClusterSettingsManager.setClusterSettings(subjectManager.getOverlord(), clusterSettings); }
rhq-commits@lists.fedorahosted.org