agent: enable ssl only for kvm agent (not in system vms) · shapeblue/cloudstack@b2d76ba · GitHub

shapeblue / cloudstack Public

forked from apache/cloudstack

• Notifications You must be signed in to change notification settings
• Fork 7
• Star 13

• Code
• Issues
• Pull requests 17
• Discussions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit b2d76ba

Browse filesBrowse the repository at this point in the historyBrowse files

weizhouapache

committed

agent: enable ssl only for kvm agent (not in system vms)

1 parent c1691a9 commit b2d76ba
Copy full SHA for b2d76ba

1 file changed

+9-2Lines changed: 9 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• agent/src/main/java/com/cloud/agent
  • AgentShell.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎agent/src/main/java/com/cloud/agent/AgentShell.java‎

Copy file name to clipboardExpand all lines: agent/src/main/java/com/cloud/agent/AgentShell.java

+9-2Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -76,6 +76,8 @@ public class AgentShell implements IAgentShell, Daemon {
76	76	private String connectedHost;
77	77	private Long preferredHostCheckInterval;
78	78
	79	+ static final String LIBVIRT_COMPUTING_RESOURCE = "com.cloud.hypervisor.kvm.resource.LibvirtComputingResource";
	80	+
79	81	public AgentShell() {
80	82	}
81	83
@@ -375,7 +377,7 @@ public void init(String[] args) throws ConfigurationException {
375	377
376	378	loadProperties();
377	379	parseCommand(args);
378		- enableSSL();
	380	+ enableSSLForKvmAgent();
379	381
380	382	if (s_logger.isDebugEnabled()) {
381	383	List<String> properties = Collections.list((Enumeration<String>)_properties.propertyNames());
@@ -399,12 +401,17 @@ public void init(String[] args) throws ConfigurationException {
399	401	_backoff.configure("ConstantTimeBackoff", new HashMap<String, Object>());
400	402	}
401	403
402		- private void enableSSL() {
	404	+ private void enableSSLForKvmAgent() {
403	405	final File agentFile = PropertiesUtil.findConfigFile("agent.properties");
404	406	if (agentFile == null) {
405	407	s_logger.info("Failed to find agent.properties file");
406	408	return;
407	409	}
	410	+ final String resource = getProperty(null, "resource");
	411	+ if (!LIBVIRT_COMPUTING_RESOURCE.equalsIgnoreCase(resource)) {
	412	+ s_logger.info("This is not a cloudstack kvm agent, ignoring");
	413	+ return;
	414	+ }
408	415	String keystorePass = getProperty(null, "keystore.passphrase");
409	416	if (StringUtils.isBlank(keystorePass)) {
410	417	s_logger.info("Failed to find passphrase for keystore: " + KeyStoreUtils.KS_FILENAME);

0 commit comments

Comments

0 (0)