Commit a16b46e
committed
Revert "KVM: Enable SSL if keystore exists (apache#6200)"
This reverts commit 4525f8c.1 parent 9b43ad2 commit a16b46e
1 file changed
Lines changed: 0 additions & 23 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,7 +27,6 @@ | |||
| 27 | 27 | import com.cloud.utils.backoff.BackoffAlgorithm; | |
| 28 | 28 | import com.cloud.utils.backoff.impl.ConstantTimeBackoff; | |
| 29 | 29 | import com.cloud.utils.exception.CloudRuntimeException; | |
| 30 | - import org.apache.cloudstack.utils.security.KeyStoreUtils; | ||
| 31 | 30 | import org.apache.commons.daemon.Daemon; | |
| 32 | 31 | import org.apache.commons.daemon.DaemonContext; | |
| 33 | 32 | import org.apache.commons.daemon.DaemonInitException; | |
@@ -375,7 +374,6 @@ public void init(String[] args) throws ConfigurationException { | |||
| 375 | 374 | ||
| 376 | 375 | loadProperties(); | |
| 377 | 376 | parseCommand(args); | |
| 378 | - enableSSL(); | ||
| 379 | 377 | ||
| 380 | 378 | if (s_logger.isDebugEnabled()) { | |
| 381 | 379 | List<String> properties = Collections.list((Enumeration<String>)_properties.propertyNames()); | |
@@ -399,27 +397,6 @@ public void init(String[] args) throws ConfigurationException { | |||
| 399 | 397 | _backoff.configure("ConstantTimeBackoff", new HashMap<String, Object>()); | |
| 400 | 398 | } | |
| 401 | 399 | ||
| 402 | - private void enableSSL() { | ||
| 403 | - final File agentFile = PropertiesUtil.findConfigFile("agent.properties"); | ||
| 404 | - if (agentFile == null) { | ||
| 405 | - s_logger.info("Failed to find agent.properties file"); | ||
| 406 | - return; | ||
| 407 | - } | ||
| 408 | - String keystorePass = getProperty(null, "keystore.passphrase"); | ||
| 409 | - if (StringUtils.isBlank(keystorePass)) { | ||
| 410 | - s_logger.info("Failed to find passphrase for keystore: " + KeyStoreUtils.KS_FILENAME); | ||
| 411 | - return; | ||
| 412 | - } | ||
| 413 | - final String keyStoreFile = agentFile.getParent() + "/" + KeyStoreUtils.KS_FILENAME; | ||
| 414 | - File f = new File(keyStoreFile); | ||
| 415 | - if (f.exists() && !f.isDirectory()) { | ||
| 416 | - System.setProperty("javax.net.ssl.trustStore", keyStoreFile); | ||
| 417 | - System.setProperty("javax.net.ssl.trustStorePassword", keystorePass); | ||
| 418 | - } else { | ||
| 419 | - s_logger.info("Failed to find keystore file: " + keyStoreFile); | ||
| 420 | - } | ||
| 421 | - } | ||
| 422 | - | ||
| 423 | 400 | private void launchAgent() throws ConfigurationException { | |
| 424 | 401 | String resourceClassNames = getProperty(null, "resource"); | |
| 425 | 402 | s_logger.trace("resource=" + resourceClassNames); | |
0 commit comments