You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/08/29 11:48:31 UTC
git commit: Update openstack-cartridge-setup.sh file with tomcat xml
Updated Branches:
refs/heads/master 44c3d76d1 -> bc21fb7cf
Update openstack-cartridge-setup.sh file with tomcat xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/bc21fb7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bc21fb7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bc21fb7c
Branch: refs/heads/master
Commit: bc21fb7cf37ee4de925b664cfd54c807d46a9349
Parents: 44c3d76
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Thu Aug 29 15:17:21 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Thu Aug 29 15:17:21 2013 +0530
----------------------------------------------------------------------
tools/stratos-installer/cartridges/tomcat.xml | 8 ++--
.../cc/repository/deployment/server/tomcat.xml | 45 ++++++++++++++++++++
.../openstack-cartridge-setup.sh | 24 +++++++++++
3 files changed, 73 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bc21fb7c/tools/stratos-installer/cartridges/tomcat.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/tomcat.xml b/tools/stratos-installer/cartridges/tomcat.xml
index cd2cca1..c38a5fa 100644
--- a/tools/stratos-installer/cartridges/tomcat.xml
+++ b/tools/stratos-installer/cartridges/tomcat.xml
@@ -12,10 +12,10 @@
in the above <iaasProviders> section) or it can create a completely new IaaS
Provider (which should have a unique "type" attribute. -->
<iaasProvider type="openstack" >
- <imageId>RegionOne/9701eb18-d7e1-4a53-a2bf-a519899d451c</imageId>
- <property name="keyPair" value="manula_openstack"/>
- <property name="instanceType" value="RegionOne/2"/>
- <property name="securityGroups" value="im-security-group1"/>
+ <imageId>nova/3a4000c8-0973-421a-94f8-dbfe8b7b5250</imageId>
+ <property name="keyPair" value="stratos-demo"/>
+ <property name="instanceType" value="nova/1"/>
+ <property name="securityGroups" value="default"/>
<!--<property name="payload" value="resources/as.txt"/>-->
</iaasProvider>
<!--<iaasProvider type="ec2" >
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bc21fb7c/tools/stratos-installer/config/cc/repository/deployment/server/tomcat.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/cc/repository/deployment/server/tomcat.xml b/tools/stratos-installer/config/cc/repository/deployment/server/tomcat.xml
new file mode 100644
index 0000000..c38a5fa
--- /dev/null
+++ b/tools/stratos-installer/config/cc/repository/deployment/server/tomcat.xml
@@ -0,0 +1,45 @@
+<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
+ <cartridges>
+
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="tomcat" host="tomcat.STRATOS_DOMAIN" provider="apache" version="7" multiTenant="false">
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+
+ <displayName>TOMCAT</displayName>
+ <description>TOMCAT Cartridge</description>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack" >
+ <imageId>nova/3a4000c8-0973-421a-94f8-dbfe8b7b5250</imageId>
+ <property name="keyPair" value="stratos-demo"/>
+ <property name="instanceType" value="nova/1"/>
+ <property name="securityGroups" value="default"/>
+ <!--<property name="payload" value="resources/as.txt"/>-->
+ </iaasProvider>
+ <!--<iaasProvider type="ec2" >
+ <imageId>us-east-1/ami-ef49e786</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+ </iaasProvider>-->
+ <deployment baseDir="/var/lib/tomcat7/webapps">
+ <dir>www=copy#app#files#here</dir>
+ <dir>simplesamlphp=copy#saml#libraries#here</dir>
+ <dir>sql=copy#saml#libraries#here</dir>
+ </deployment>
+ <portMapping>
+ <http port="8080" proxyPort="8280"/>
+ <https port="8443" proxyPort="8243"/>
+ </portMapping>
+ <!--<appTypes>
+ <property name="axis2services" isBothmapping="false"/>
+ <property name="webapps" isBothmapping="true"/>
+ <property name="jaxwebapps" isBothmapping="true"/>
+ <property name="jaggeryapps" isBothmapping="true"/>
+ </appTypes>-->
+ </cartridge>
+
+ </cartridges>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bc21fb7c/tools/stratos-installer/openstack-cartridge-setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/openstack-cartridge-setup.sh b/tools/stratos-installer/openstack-cartridge-setup.sh
index 711776b..3f8c4d8 100755
--- a/tools/stratos-installer/openstack-cartridge-setup.sh
+++ b/tools/stratos-installer/openstack-cartridge-setup.sh
@@ -120,4 +120,28 @@ cat repository/deployment/server/cartridges/php.xml.orig | sed -e "s@<imageId>*.
cp -f repository/deployment/server/cartridges/php.xml repository/deployment/server/cartridges/php.xml.orig
cat repository/deployment/server/cartridges/php.xml.orig | sed -e "s@STRATOS_DOMAIN@$stratos2_domain@g" > repository/deployment/server/cartridges/php.xml
+echo "Updating repository/deployment/server/cartridges/tomcat.xml" | tee $LOG
+# <iaasProvider type="openstack" >
+# <imageId>RegionOne/9701eb18-d7e1-4a53-a2bf-a519899d451c</imageId>
+# <property name="keyPair" value="manula_openstack"/>
+# <property name="instanceType" value="RegionOne/2"/>
+# <property name="securityGroups" value="im-security-group1"/>
+# <!--<property name="payload" value="resources/as.txt"/>-->
+# </iaasProvider>
+
+cp -f repository/deployment/server/cartridges/tomcat.xml repository/deployment/server/cartridges/tomcat.xml.orig
+cat repository/deployment/server/cartridges/tomcat.xml.orig | sed -e "s@<property name=\"keyPair\" value=\"*.*\"/>@<property name=\"keyPair\" value=\"$openstack_keypair_name\"/>@g" > repository/deployment/server/cartridges/tomcat.xml
+
+cp -f repository/deployment/server/cartridges/tomcat.xml repository/deployment/server/cartridges/tomcat.xml.orig
+cat repository/deployment/server/cartridges/tomcat.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$openstack_instance_type_tiny\"/>@g" > repository/deployment/server/cartridges/tomcat.xml
+
+cp -f repository/deployment/server/cartridges/tomcat.xml repository/deployment/server/cartridges/tomcat.xml.orig
+cat repository/deployment/server/cartridges/tomcat.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$openstack_security_group\"/>@g" > repository/deployment/server/cartridges/tomcat.xml
+
+cp -f repository/deployment/server/cartridges/tomcat.xml repository/deployment/server/cartridges/tomcat.xml.orig
+cat repository/deployment/server/cartridges/tomcat.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$nova_region/$tomcat_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/tomcat.xml
+
+cp -f repository/deployment/server/cartridges/tomcat.xml repository/deployment/server/cartridges/tomcat.xml.orig
+cat repository/deployment/server/cartridges/tomcat.xml.orig | sed -e "s@STRATOS_DOMAIN@$stratos2_domain@g" > repository/deployment/server/cartridges/tomcat.xml
+
popd # cc_path