Repository: stratos Updated Branches: refs/heads/master 1d6c6664d -> a0039e582
Fixing tomcat server starter PCA plugin & wso2is cartridge port mapping protocol Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a0039e58 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a0039e58 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a0039e58 Branch: refs/heads/master Commit: a0039e58293e7bd8091b5d5754ea5fab26f5e2cf Parents: 1d6c666 Author: Imesh Gunaratne <[email protected]> Authored: Sun May 31 16:24:53 2015 +0100 Committer: Imesh Gunaratne <[email protected]> Committed: Sun May 31 16:24:53 2015 +0100 ---------------------------------------------------------------------- samples/cartridges/kubernetes/wso2-is.json | 2 +- .../packs/plugins/TomcatServerStarterPlugin.py | 35 ++++++++++++++++---- .../plugins/TomcatWSO2ISMetadataPublisher.py | 3 +- .../packs/plugins/WSO2ISMetaDataHandler.py | 6 ++-- 4 files changed, 36 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a0039e58/samples/cartridges/kubernetes/wso2-is.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/wso2-is.json b/samples/cartridges/kubernetes/wso2-is.json index 67a1c98..2b51714 100644 --- a/samples/cartridges/kubernetes/wso2-is.json +++ b/samples/cartridges/kubernetes/wso2-is.json @@ -10,7 +10,7 @@ "portMapping": [ { "name": "mgt-console", - "protocol": "http", + "protocol": "https", "port": "9443", "proxyPort": "8443" } http://git-wip-us.apache.org/repos/asf/stratos/blob/a0039e58/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 3a8330e..af7597f 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 @@ -28,6 +28,8 @@ class TomcatServerStarterPlugin(ICartridgeAgentPlugin): def run_plugin(self, values): log = LogFactory().get_log(__name__) + log.info("Starting tomcat server starter plugin...") + # wait till SAML_ENDPOINT becomes available mds_response = None while mds_response is None: @@ -47,17 +49,38 @@ class TomcatServerStarterPlugin(ICartridgeAgentPlugin): env_var["STRATOS_SAML_ENDPOINT"] = saml_endpoint 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"] = 4500 + log.info("Reading port mappings...") + port_mappings_str = values["PORT_MAPPINGS"] + tomcat_http_port = None + + # port mappings format: """NAME:mgt-console|PROTOCOL:https|PORT:4500|PROXY_PORT:8443; + # NAME:tomcat-http|PROTOCOL:http|PORT:4501|PROXY_PORT:7280;""" + + log.info("Port mappings: %s" % port_mappings_str) + if port_mappings_str is not None: + + port_mappings_array = port_mappings_str.split(";") + if port_mappings_array: + + for port_mapping in port_mappings_array: + log.debug("port_mapping: %s" % port_mapping) + name_value_array = port_mapping.split("|") + name = name_value_array[0].split(":")[1] + protocol = name_value_array[1].split(":")[1] + port = name_value_array[2].split(":")[1] + if name == "tomcat-http" and protocol == "http": + tomcat_http_port = port + + log.info("Kubernetes service port of tomcat http transport: %s" % tomcat_http_port) + env_var["STRATOS_HOST_PORT"] = tomcat_http_port p = subprocess.Popen(tomcat_start_command, env=env_var, shell=True) output, errors = p.communicate() log.debug("Tomcat server started") + log.info("Tomcat server starter plugin completed") + + http://git-wip-us.apache.org/repos/asf/stratos/blob/a0039e58/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py index b6a2d98..38e5a8e 100644 --- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py +++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py @@ -36,7 +36,6 @@ class TomcatWSO2ISMetadataPublisher(ICartridgeAgentPlugin): log.info("Reading port mappings...") port_mappings_str = values["PORT_MAPPINGS"] - tomcat_http_port = None # port mappings format: """NAME:mgt-console|PROTOCOL:https|PORT:4500|PROXY_PORT:8443; @@ -57,6 +56,8 @@ class TomcatWSO2ISMetadataPublisher(ICartridgeAgentPlugin): if name == "tomcat-http" and protocol == "http": tomcat_http_port = port + log.info("Kubernetes service port of tomcat http transport: %s" % tomcat_http_port) + callback_url = "http://%s:%s/travelocity.com/home.jsp"; % (cluster_hostname, tomcat_http_port) callback_url_property = {"key": "CALLBACK_URL", "values": [ callback_url ]} http://git-wip-us.apache.org/repos/asf/stratos/blob/a0039e58/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 439f53e..0a7a2d4 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 @@ -122,7 +122,9 @@ class WSO2ISMetaDataHandler(ICartridgeAgentPlugin): port_mappings_str = values["PORT_MAPPINGS"] https_port = None - # port mappings format: "PROTOCOL:http|PORT:80|PROXY_PORT:8280,PROTOCOL:https|PORT:773|PROXY_PORT:9443" + # port mappings format: """NAME:mgt-console|PROTOCOL:https|PORT:4500|PROXY_PORT:8443; + # NAME:tomcat-http|PROTOCOL:http|PORT:4501|PROXY_PORT:7280;""" + log.info("Port mappings: %s" % port_mappings_str) if port_mappings_str is not None: @@ -137,7 +139,7 @@ class WSO2ISMetaDataHandler(ICartridgeAgentPlugin): if protocol == "https": https_port = port - log.info("Kubernetes service management console https port: %s" % https_port) + log.info("Kubernetes service port of wso2is management console https transport: %s" % https_port) saml_endpoint = "https://%s:%s/samlsso"; % (member_hostname, https_port) saml_endpoint_property = {"key": "SAML_ENDPOINT", "values": [ saml_endpoint ]}
