You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2019/03/20 09:24:32 UTC
[brooklyn-server] branch master updated: minor changes to make
working w AWS profiles easier
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 6ce94a8 minor changes to make working w AWS profiles easier
new f70a517 Merge pull request #1057 from ahgittin/aws-profile-tidy
6ce94a8 is described below
commit 6ce94a896029a4e17daa47d46d60adeed7da9368
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon Mar 18 16:20:24 2019 +0000
minor changes to make working w AWS profiles easier
---
.../location/jclouds/AwsEc2SessionAwareLocationConfig.java | 2 +-
.../src/main/resources/brooklyn/logback-logger-excludes.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AwsEc2SessionAwareLocationConfig.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AwsEc2SessionAwareLocationConfig.java
index d20f846..fc98672 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AwsEc2SessionAwareLocationConfig.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AwsEc2SessionAwareLocationConfig.java
@@ -24,5 +24,5 @@ import org.apache.brooklyn.core.config.ConfigKeys;
public interface AwsEc2SessionAwareLocationConfig extends JcloudsLocationConfig{
ConfigKey<String> IAM_ROLE_NAME = ConfigKeys.newStringConfigKey("iamRoleName",
- "Use IAM role to get session credentials when connecting to AWS EC2", "brooklyn");
+ "IAM role / profile name to get session credentials when connecting to AWS EC2", "brooklyn");
}
diff --git a/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml b/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
index 9d4bb4c..f4b4644 100644
--- a/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
+++ b/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
@@ -60,6 +60,11 @@
<logger name="org.mongodb.driver" level="WARN" additivity="false">
<appender-ref ref="FILE" />
</logger>
+ <!-- Also very noisy even at WARN, if you have [profile xxx] in your ~/.aws/config file;
+ as with o.a.http above, this requires our custom bridge from LoggingSetup to be configured, or comparable -->
+ <logger name="com.amazonaws.auth.profile.internal.BasicProfileConfigLoader" level="ERROR" additivity="false">
+ <appender-ref ref="FILE" />
+ </logger>
<!-- CXF logging is extremely verbose, including
debug logging for every REST in and out,
@@ -69,4 +74,6 @@
<logger name="org.apache.cxf" level="ERROR"/>
<logger name="io.cloudsoft.winrm4j.winrm.WinRmTool" level="DEBUG"/>
+
+
</included>