Repository: stratos Updated Branches: refs/heads/master 48a6b2f70 -> 7f1c44aae
adding puppet master DNS support Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7f1c44aa Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7f1c44aa Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7f1c44aa Branch: refs/heads/master Commit: 7f1c44aaed5d4bbafd53214d69fb9ec22ff2853b Parents: 48a6b2f Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Aug 26 15:40:19 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Aug 26 15:40:19 2014 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/manager/payload/BasicPayloadData.java | 2 ++ .../org/apache/stratos/manager/utils/CartridgeConstants.java | 1 + .../distribution/src/main/conf/cartridge-config.properties | 1 + tools/puppet3-agent/centos/init.sh | 6 +++++- tools/puppet3-agent/init.sh | 5 ++++- 5 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7f1c44aa/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 70fb974..234dac1 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 @@ -91,6 +91,8 @@ public class BasicPayloadData implements Serializable { payloadBuilder.append(","); payloadBuilder.append("PUPPET_HOSTNAME=" + System.getProperty(CartridgeConstants.PUPPET_HOSTNAME)); payloadBuilder.append(","); + payloadBuilder.append("PUPPET_DNS_AVAILABLE=" + System.getProperty(CartridgeConstants.PUPPET_DNS_AVAILABLE)); + payloadBuilder.append(","); payloadBuilder.append("PUPPET_ENV=" + System.getProperty(CartridgeConstants.PUPPET_ENVIRONMENT)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/7f1c44aa/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 6ed5564..ab78bd6 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 @@ -33,6 +33,7 @@ public class CartridgeConstants { 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_DNS_AVAILABLE = "puppet.dns.available"; public static final String PUPPET_ENVIRONMENT = "puppet.environment"; public static final String SUDO_SH = "sudo sh"; http://git-wip-us.apache.org/repos/asf/stratos/blob/7f1c44aa/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties b/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties index 4a121d8..09ae7fe 100644 --- a/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties +++ b/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties @@ -23,5 +23,6 @@ autoscaler.service.url=https://localhost:9443/services/AutoScalerService/ cloud.controller.service.url=https://localhost:9443/services/CloudControllerService/ puppet.ip=127.0.0.1 puppet.hostname=puppet.apache.stratos.org +puppet.dns.available=false puppet.environment=stratos http://git-wip-us.apache.org/repos/asf/stratos/blob/7f1c44aa/tools/puppet3-agent/centos/init.sh ---------------------------------------------------------------------- diff --git a/tools/puppet3-agent/centos/init.sh b/tools/puppet3-agent/centos/init.sh index 4e91c80..bc2aa4b 100644 --- a/tools/puppet3-agent/centos/init.sh +++ b/tools/puppet3-agent/centos/init.sh @@ -106,6 +106,7 @@ if [ ! -d /tmp/payload ]; then PUPPET_IP=`sed 's/,/\n/g' launch-params | grep PUPPET_IP | cut -d "=" -f 2` PUPPET_HOSTNAME=`sed 's/,/\n/g' launch-params | grep PUPPET_HOSTNAME | cut -d "=" -f 2` PUPPET_ENV=`sed 's/,/\n/g' launch-params | grep PUPPET_ENV | cut -d "=" -f 2` + PUPPET_DNS_AVAILABLE=`sed 's/,/\n/g' launch-params | grep PUPPET_DNS_AVAILABLE | cut -d "=" -f 2` NODEID="${RANDOMNUMBER}.${DEPLOYMENT}.${SERVICE_NAME}" @@ -120,7 +121,10 @@ if [ ! -d /tmp/payload ]; then HOST="${NODEID}.${DOMAIN}" ${HOSTNAME} ${HOST} ${ECHO} "${HOST}" > ${HOSTNAMEFILE} - ${ECHO} "${PUPPET_IP} ${PUPPET_HOSTNAME}" >> ${HOSTSFILE} + if [ true != $PUPPET_DNS_AVAILABLE ] ; then + ${ECHO} "${PUPPET_IP} ${PUPPET_HOSTNAME}" >> ${HOSTSFILE} + fi + ${ECHO} "127.0.0.1 ${HOST}" >> ${HOSTSFILE} echo ${HOST} > /proc/sys/kernel/hostname http://git-wip-us.apache.org/repos/asf/stratos/blob/7f1c44aa/tools/puppet3-agent/init.sh ---------------------------------------------------------------------- diff --git a/tools/puppet3-agent/init.sh b/tools/puppet3-agent/init.sh index 9627416..a8f0ceb 100755 --- a/tools/puppet3-agent/init.sh +++ b/tools/puppet3-agent/init.sh @@ -98,6 +98,7 @@ if [ ! -d /tmp/payload ]; then INSTANCE_HOSTNAME=`sed 's/,/\n/g' launch-params | grep HOSTNAME | cut -d "=" -f 2` PUPPET_IP=`sed 's/,/\n/g' launch-params | grep PUPPET_IP | cut -d "=" -f 2` PUPPET_HOSTNAME=`sed 's/,/\n/g' launch-params | grep PUPPET_HOSTNAME | cut -d "=" -f 2` + PUPPET_DNS_AVAILABLE=`sed 's/,/\n/g' launch-params | grep PUPPET_DNS_AVAILABLE | cut -d "=" -f 2` PUPPET_ENV=`sed 's/,/\n/g' launch-params | grep PUPPET_ENV | cut -d "=" -f 2` NODEID="${RANDOMNUMBER}.${DEPLOYMENT}.${SERVICE_NAME}" #essential to have PUPPET_HOSTNAME at the end in order to auto-sign the certs @@ -110,7 +111,9 @@ if [ ! -d /tmp/payload ]; then HOST="${NODEID}.${DOMAIN}" ${HOSTNAME} ${HOST} ${ECHO} "${HOST}" > ${HOSTNAMEFILE} - ${ECHO} "${PUPPET_IP} ${PUPPET_HOSTNAME}" >> ${HOSTSFILE} + if [ true != $PUPPET_DNS_AVAILABLE ] ; then + ${ECHO} "${PUPPET_IP} ${PUPPET_HOSTNAME}" >> ${HOSTSFILE} + fi ${ECHO} "127.0.0.1 ${HOST}" >> ${HOSTSFILE} /etc/init.d/hostname start
