brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [3/6] incubator-brooklyn git commit: Deprecates JcloudsLocation.open/stopIptables config
Date Tue, 28 Jul 2015 23:13:07 GMT
Deprecates JcloudsLocation.open/stopIptables config


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/42d60916
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/42d60916
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/42d60916

Branch: refs/heads/master
Commit: 42d6091663495665dc68c0d45d2e640984b3ad89
Parents: 4980904
Author: Aled Sage <aled.sage@gmail.com>
Authored: Sat Jul 25 14:58:03 2015 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Mon Jul 27 13:50:00 2015 +0100

----------------------------------------------------------------------
 .../java/brooklyn/location/jclouds/JcloudsLocation.java |  8 ++++++--
 .../location/jclouds/JcloudsLocationConfig.java         | 12 ++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/42d60916/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
index c4996df..60119ea 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
@@ -877,8 +877,10 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation
im
 
                 if (setup.get(OPEN_IPTABLES)) {
                     if (windows) {
-                        LOG.warn("Ignoring flag OPEN_IPTABLES on Windows location {}", machineLocation);
+                        LOG.warn("Ignoring DEPRECATED flag OPEN_IPTABLES on Windows location
{}", machineLocation);
                     } else {
+                        LOG.warn("Using DEPRECATED flag OPEN_IPTABLES (will not be supported
in future versions) for {} at {}", machineLocation, this);
+                        
                         @SuppressWarnings("unchecked")
                         Iterable<Integer> inboundPorts = (Iterable<Integer>)
setup.get(INBOUND_PORTS);
 
@@ -917,8 +919,10 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation
im
 
                 if (setup.get(STOP_IPTABLES)) {
                     if (windows) {
-                        LOG.warn("Ignoring flag OPEN_IPTABLES on Windows location {}", machineLocation);
+                        LOG.warn("Ignoring DEPRECATED flag OPEN_IPTABLES on Windows location
{}", machineLocation);
                     } else {
+                        LOG.warn("Using DEPRECATED flag STOP_IPTABLES (will not be supported
in future versions) for {} at {}", machineLocation, this);
+                        
                         customisationForLogging.add("stop iptables");
 
                         List<String> cmds = ImmutableList.<String>of();

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/42d60916/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
index c37d915..2d570ae 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
@@ -106,12 +106,20 @@ public interface JcloudsLocationConfig extends CloudLocationConfig {
             Constants.PROPERTY_ENDPOINT, "Equivalent to 'endpoint'; provided for jclouds
compatibility", null);
     
     // note causing problems on centos due to use of `sudo -n`; but required for default
RHEL VM
+    /**
+     * @deprecated since 0.8.0; instead configure this on the entity. See SoftwareProcess.OPEN_IPTABLES.
+     */
+    @Deprecated
     public static final ConfigKey<Boolean> OPEN_IPTABLES = ConfigKeys.newBooleanConfigKey("openIptables",

-            "Whether to open the INBOUND_PORTS via iptables rules; " +
+            "[DEPRECATED - use openIptables on SoftwareProcess entity] Whether to open the
INBOUND_PORTS via iptables rules; " +
             "if true then ssh in to run iptables commands, as part of machine provisioning",
false);
 
+    /**
+     * @deprecated since 0.8.0; instead configure this on the entity. See SoftwareProcess.STOP_IPTABLES.
+     */
+    @Deprecated
     public static final ConfigKey<Boolean> STOP_IPTABLES = ConfigKeys.newBooleanConfigKey("stopIptables",

-            "Whether to stop iptables entirely; " +
+            "[DEPRECATED - use stopIptables on SoftwareProcess entity] Whether to stop iptables
entirely; " +
             "if true then ssh in to stop the iptables service, as part of machine provisioning",
false);
 
     public static final ConfigKey<String> HARDWARE_ID = ConfigKeys.newStringConfigKey("hardwareId",


Mime
View raw message