stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject [01/12] stratos git commit: fixing issues in GCEIaas class and gce config.sh
Date Thu, 04 Jun 2015 06:32:53 GMT
Repository: stratos
Updated Branches:
  refs/heads/master 653684ebf -> c14c6b16e


fixing issues in GCEIaas class and gce config.sh


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9a262f2b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9a262f2b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9a262f2b

Branch: refs/heads/master
Commit: 9a262f2b03520a6857f21cb920817c55749f9b41
Parents: 2fe84b9
Author: asanka sanjaya <angal.sh@gmail.com>
Authored: Wed Jun 3 10:01:21 2015 +0000
Committer: asanka sanjaya <angal.sh@gmail.com>
Committed: Wed Jun 3 10:01:21 2015 +0000

----------------------------------------------------------------------
 .../org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java  | 4 ++--
 tools/config-scripts/gce/config.sh                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/9a262f2b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
index d5ae1ec..975fe0c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
@@ -181,9 +181,9 @@ public class GCEIaas extends JcloudsIaas {
         // in vCloud case we need to run a script
         IaasProvider iaasInfo = getIaasProvider();
 
-        if (iaasInfo.getTemplate() == null || iaasInfo.getPayload() == null) {
+        if (iaasInfo.getTemplate() == null || payload == null) {
             if (log.isDebugEnabled()) {
-                log.debug("Payload for GCE not found");
+                log.debug("Template or payload for GCE not found");
             }
             return;
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/9a262f2b/tools/config-scripts/gce/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/gce/config.sh b/tools/config-scripts/gce/config.sh
index 0c1cbc7..140895f 100644
--- a/tools/config-scripts/gce/config.sh
+++ b/tools/config-scripts/gce/config.sh
@@ -90,7 +90,7 @@ if [[ $answer = y ]] ; then
 	ARGS=("-n${NODEID}" "-d${DOMAIN}" "-s${PUPPET_IP}")
 	${ECHO} "\nRunning puppet installation with arguments: ${ARGS[@]}"
 	/root/bin/puppetinstall/puppetinstall "${ARGS[@]}"
-        ${RM} /mnt/apache-stratos-cartridge-agent-4.0.0/wso2carbon.lck
+        ${RM} /mnt/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT/wso2carbon.lck
 	${GREP} -q '/root/bin/init.sh > /tmp/puppet_log' /etc/rc.local || ${SED} -i 's/exit 0$/\/root\/bin\/init.sh
\> \/tmp\/puppet_log\nexit 0/' /etc/rc.local
 	${RM} -rf /tmp/*
 	${RM} -rf /var/lib/puppet/ssl/*


Mime
View raw message