Repository: incubator-stratos Updated Branches: refs/heads/master ead470ed9 -> 4ea7f31b2
adding puppet.hostname, puppet.environment to SM's configuration file and adding them to the payload Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4ea7f31b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4ea7f31b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4ea7f31b Branch: refs/heads/master Commit: 4ea7f31b2e5d22d62f535452cbd505e804a1bc59 Parents: ead470e Author: Isuru <[email protected]> Authored: Fri Feb 21 16:58:25 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Feb 21 16:58:25 2014 +0530 ---------------------------------------------------------------------- .../manager/payload/BasicPayloadData.java | 23 ++++++++++++++++++++ .../manager/utils/CartridgeConstants.java | 2 ++ .../src/main/conf/cartridge-config.properties | 3 +++ 3 files changed, 28 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4ea7f31b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java index 3c14a97..21f7354 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/BasicPayloadData.java @@ -40,6 +40,8 @@ public class BasicPayloadData implements Serializable { private String subscriptionAlias; private String deployment; private String puppetIp; + private String puppetHostName; + private String puppetEnvironment; private String subscriptionKey; private String applicationPath; private String gitRepositoryUrl; @@ -83,6 +85,11 @@ public class BasicPayloadData implements Serializable { //Payload Data exposed as system variables payloadBuilder.append(","); payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP)); + payloadBuilder.append(","); + payloadBuilder.append("PUPPET_HOSTNAME=" + System.getProperty(CartridgeConstants.PUPPET_HOSTNAME)); + payloadBuilder.append(","); + payloadBuilder.append("PUPPET_ENV=" + System.getProperty(CartridgeConstants.PUPPET_ENVIRONMENT)); + } public String getServiceName() { @@ -193,4 +200,20 @@ public class BasicPayloadData implements Serializable { public void setMultitenant(String multitenant) { this.multitenant = multitenant; } + + public String getPuppetHostName() { + return puppetHostName; + } + + public void setPuppetHostName(String puppetHostName) { + this.puppetHostName = puppetHostName; + } + + public String getPuppetEnvironment() { + return puppetEnvironment; + } + + public void setPuppetEnvironment(String puppetEnvironment) { + this.puppetEnvironment = puppetEnvironment; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4ea7f31b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java index f3ff654..a64a235 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java @@ -32,6 +32,8 @@ public class CartridgeConstants { public static final String SUBSCRIBED = "SUBSCRIBED"; public static final String UNSUBSCRIBED = "UNSUBSCRIBED"; public static final String PUPPET_IP = "puppet.ip"; + public static final String PUPPET_HOSTNAME = "puppet.hostname"; + public static final String PUPPET_ENVIRONMENT = "puppet.environment"; public static final String SUDO_SH = "sudo sh"; public static final String APPEND_SCRIPT = "append.script"; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4ea7f31b/products/stratos-manager/modules/distribution/src/main/conf/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/products/stratos-manager/modules/distribution/src/main/conf/cartridge-config.properties b/products/stratos-manager/modules/distribution/src/main/conf/cartridge-config.properties index 302b4c1..eaa7dcc 100644 --- a/products/stratos-manager/modules/distribution/src/main/conf/cartridge-config.properties +++ b/products/stratos-manager/modules/distribution/src/main/conf/cartridge-config.properties @@ -22,3 +22,6 @@ autoscaler.service.url=https://as.stratos.apache.org:9446/services/AutoScalerService/ cloud.controller.service.url=https://cc.stratos.apache.org:9444/services/CloudControllerService/ puppet.ip=127.0.0.1 +puppet.hostname=puppet.apache.stratos.org +puppet.environment=stratos +
