Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 217bc5476 -> 10fdc0712
adding puppet related info to the text payload Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bc967e30 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bc967e30 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bc967e30 Branch: refs/heads/4.0.0-grouping Commit: bc967e308b7c21813f2bbd0cda0e6d223cd0a8d1 Parents: 66042d4 Author: Isuru Haththotuwa <[email protected]> Authored: Thu Sep 25 13:40:14 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Sep 25 13:40:14 2014 +0530 ---------------------------------------------------------------------- .../controller/application/ApplicationUtils.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/bc967e30/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java index 7117170..695af5d 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/ApplicationUtils.java @@ -127,7 +127,7 @@ public class ApplicationUtils { // cartridge key clusterLevelPayloadProperties.setProperty("CARTRIDGE_KEY", key); // get global payload params - clusterLevelPayloadProperties.putAll(ApplicationUtils.getGlobalPayloadData()); + //clusterLevelPayloadProperties.putAll(ApplicationUtils.getGlobalPayloadData()); metaDataHolder.setProperties(clusterLevelPayloadProperties); return metaDataHolder; @@ -158,6 +158,23 @@ public class ApplicationUtils { } payloadBuilder.append(","); payloadBuilder.append("CLUSTER_ID=" + clusterId); + // puppet related + if (System.getProperty("puppet.ip") != null) { + payloadBuilder.append(","); + payloadBuilder.append("PUPPET_IP=" + System.getProperty("puppet.ip")); + } + if (System.getProperty("puppet.hostname") != null) { + payloadBuilder.append(","); + payloadBuilder.append("PUPPET_HOSTNAME=" + System.getProperty("puppet.hostname")); + } + if (System.getProperty("puppet.env") != null) { + payloadBuilder.append(","); + payloadBuilder.append("PUPPET_ENV=" + System.getProperty("puppet.env")); + } + if (System.getProperty("puppet.dns.available") != null) { + payloadBuilder.append(","); + payloadBuilder.append("PUPPET_DNS_AVAILABLE=" + System.getProperty("puppet.dns.available")); + } // meta data endpoint // if (MetaDataClientConfig.getInstance().getMetaDataServiceBaseUrl() != null) { // TODO
