You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/03/02 01:26:19 UTC
stratos git commit: Fixing parameterization issues in tomcat-saml-sso
and wso2is-saml-sso docker images
Repository: stratos
Updated Branches:
refs/heads/master 6df6a20d6 -> 8f17100c8
Fixing parameterization issues in tomcat-saml-sso and wso2is-saml-sso docker images
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8f17100c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8f17100c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8f17100c
Branch: refs/heads/master
Commit: 8f17100c8a68f0275a1fd01e97ee55150179d0df
Parents: 6df6a20
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Mar 2 05:56:05 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Mar 2 05:56:05 2015 +0530
----------------------------------------------------------------------
.../tomcat-single-signon/scripts/kubernetes/deploy.sh | 2 +-
.../kubernetes/network-partition-3.json | 2 +-
.../service-images/tomcat-saml-sso/Dockerfile | 7 +++++--
.../service-images/tomcat-saml-sso/files/env | 7 +++++--
.../packs/plugins/TomcatServerStarterPlugin.py | 10 +++++++++-
.../service-images/wso2is-saml-sso/Dockerfile | 7 +++++--
.../service-images/wso2is-saml-sso/files/env | 7 +++++--
.../packs/plugins/WSO2ISMetaDataHandler.py | 12 ++++++------
8 files changed, 37 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8f17100c/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh b/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh
index 753af7e..d6c47c1 100755
--- a/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh
+++ b/samples/applications/tomcat-single-signon/scripts/kubernetes/deploy.sh
@@ -11,6 +11,6 @@ kubernetes_clusters_path=`cd "${script_path}/../../../../kubernetes-clusters"; p
echo "Adding kubernetes cluster..."
-curl -X POST -H "Content-Type: application/json" -d "@${kubernetes_clusters_path}/kubernetes-cluster-ec2.json" -k -u admin:admin https://${host_ip}:${host_port}/api/kubernetesClusters
+curl -X POST -H "Content-Type: application/json" -d "@${kubernetes_clusters_path}/kubernetes-cluster-1.json" -k -u admin:admin https://${host_ip}:${host_port}/api/kubernetesClusters
bash ${common_folder}/deploy.sh ${iaas}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8f17100c/samples/network-partitions/kubernetes/network-partition-3.json
----------------------------------------------------------------------
diff --git a/samples/network-partitions/kubernetes/network-partition-3.json b/samples/network-partitions/kubernetes/network-partition-3.json
index dd3874f..ffdf4bb 100644
--- a/samples/network-partitions/kubernetes/network-partition-3.json
+++ b/samples/network-partitions/kubernetes/network-partition-3.json
@@ -7,7 +7,7 @@
"property": [
{
"name": "cluster",
- "value": "kubernetes-cluster-ec2"
+ "value": "kubernetes-cluster-1"
}
]
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8f17100c/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
index 17f8978..b5ada30 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile
@@ -23,7 +23,8 @@ ENV CATALINA_HOME /opt/tomcat
# Install Tomcat
# ----------------------
ADD packs/apache-tomcat-${TOMCAT_VERSION}.tar.gz /opt/apache-tomcat-${TOMCAT_VERSION}.tar.gz
-RUN mv /opt/apache-tomcat-${TOMCAT_VERSION}.tar.gz/apache-tomcat-${TOMCAT_VERSION} /opt/tomcat
+RUN mv /opt/apache-tomcat-${TOMCAT_VERSION}.tar.gz/apache-tomcat-${TOMCAT_VERSION} /opt/tomcat && \
+ rm -rf /opt/apache-tomcat-${TOMCAT_VERSION}.tar.gz
# -----------------------
# Add shell scripts
@@ -34,7 +35,9 @@ RUN chmod +x /opt/create-admin-user.sh && \
bash /opt/create-admin-user.sh
ADD files/env /tmp/env
-RUN cat /tmp/env >> /etc/environment
+RUN chmod +x /tmp/env && \
+ sleep 1 && \
+ /tmp/env ${JAVA_HOME} ${CATALINA_HOME}
#------------------------
# Copy Tomcat related PCA plugins
http://git-wip-us.apache.org/repos/asf/stratos/blob/8f17100c/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/files/env
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/files/env b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/files/env
index 97d9119..b9deae3 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/files/env
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/files/env
@@ -1,2 +1,5 @@
-JAVA_HOME=/opt/jdk1.7.0_67
-CATALINA_HOME=/opt/tomcat
\ No newline at end of file
+JAVA_HOME=$1
+CATALINA_HOME=$2
+
+echo "JAVA_HOME=${JAVA_HOME}" >> /etc/environment
+echo "CATALINA_HOME=${CATALINA_HOME}" >> /etc/environment
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/8f17100c/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatServerStarterPlugin.py
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatServerStarterPlugin.py b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatServerStarterPlugin.py
index eda93c1..8e0cfb8 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatServerStarterPlugin.py
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatServerStarterPlugin.py
@@ -45,7 +45,15 @@ class TomcatServerStarterPlugin(ICartridgeAgentPlugin):
log.info("Starting Tomcat server: [command] %s, [STRATOS_SAML_ENDPOINT] %s" % (tomcat_start_command, saml_endpoint))
env_var = os.environ.copy()
env_var["STRATOS_SAML_ENDPOINT"] = saml_endpoint
- env_var["JAVA_HOME"] = "/opt/jdk1.7.0_67"
+
+ env_var["STRATOS_HOST_NAME"] = values["HOST_NAME"]
+ payload_ports = values["PORT_MAPPINGS"].split("|")
+ if values.get("LB_CLUSTER_ID") is not None:
+ port_no = payload_ports[2].split(":")[1]
+ else:
+ port_no = payload_ports[1].split(":")[1]
+ env_var["STRATOS_HOST_PORT"] = port_no
+
p = subprocess.Popen(tomcat_start_command, env=env_var, shell=True)
output, errors = p.communicate()
log.debug("Tomcat server started")
http://git-wip-us.apache.org/repos/asf/stratos/blob/8f17100c/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
index a0515f9..9b83d8d 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile
@@ -19,11 +19,14 @@ ENV JAVA_HOME /opt/jdk${JDK_VERSION}
# Install WSO2 Identity Server
# -----------------------------
ADD packs/wso2is-${WSO2_IS_VERSION}.zip /opt/wso2is-${WSO2_IS_VERSION}.zip
-RUN unzip /opt/wso2is-${WSO2_IS_VERSION}.zip -d /opt/
+RUN unzip /opt/wso2is-${WSO2_IS_VERSION}.zip -d /opt/ && \
+ rm /opt/wso2is-${WSO2_IS_VERSION}.zip
ENV CARBON_HOME /opt/wso2is-${WSO2_IS_VERSION}
ADD files/env /tmp/env
-RUN cat /tmp/env >> /etc/environment
+RUN chmod +x /tmp/env && \
+ sleep 1 && \
+ /tmp/env ${JAVA_HOME} ${CARBON_HOME}
ADD files/carbon.xml ${CARBON_HOME}/repository/conf/carbon.xml
http://git-wip-us.apache.org/repos/asf/stratos/blob/8f17100c/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/files/env
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/files/env b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/files/env
index 1248bbc..2c58d27 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/files/env
+++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/files/env
@@ -1,2 +1,5 @@
-JAVA_HOME=/opt/jdk1.7.0_67
-CARBON_HOME=/opt/wso2is-5.0.0-SP1
\ No newline at end of file
+JAVA_HOME=$1
+CARBON_HOME=$2
+
+echo "JAVA_HOME=${JAVA_HOME}" >> /etc/environment
+echo "CARBON_HOME=${CARBON_HOME}" >> /etc/environment
http://git-wip-us.apache.org/repos/asf/stratos/blob/8f17100c/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py
----------------------------------------------------------------------
diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py
index 53e10fe..f1bdcc4 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py
+++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py
@@ -36,9 +36,10 @@ class WSO2ISMetaDataHandler(ICartridgeAgentPlugin):
% values["APPLICATION_ID"])
time.sleep(5)
mds_response = mdsclient.get(app=True)
- if mds_response is not None and mds_response.properties.get("SSO_ISSUER") is None or \
- mds_response.properties.get("CALLBACK_URL") is None:
- mds_response = None
+ if mds_response is not None:
+ if mds_response.properties.get("SSO_ISSUER") is None or \
+ mds_response.properties.get("CALLBACK_URL") is None:
+ mds_response = None
# mds_response = mdsclient.get()
issuer = mds_response.properties["SSO_ISSUER"]
acs = mds_response.properties["CALLBACK_URL"]
@@ -130,15 +131,14 @@ class WSO2ISMetaDataHandler(ICartridgeAgentPlugin):
log.info("Starting WSO2 IS server")
# set configurations
- carbon_replace_command = "sed -i \"s/CLUSTER_HOST_NAME/%s/g\" %s" % (member_hostname, "/opt/wso2is-5.0.0/repository/conf/carbon.xml")
+ carbon_replace_command = "sed -i \"s/CLUSTER_HOST_NAME/%s/g\" %s" % (member_hostname, "${CARBON_HOME}/repository/conf/carbon.xml")
p = subprocess.Popen(carbon_replace_command, shell=True)
output, errors = p.communicate()
log.debug("Set carbon.xml hostname")
- wso2is_start_command = "exec /opt/wso2is-5.0.0/bin/wso2server.sh start"
+ wso2is_start_command = "exec ${CARBON_HOME}/bin/wso2server.sh start"
env_var = os.environ.copy()
- env_var["JAVA_HOME"] = "/opt/jdk1.7.0_67"
p = subprocess.Popen(wso2is_start_command, env=env_var, shell=True)
output, errors = p.communicate()
log.debug("WSO2 IS server started")