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/09/05 13:23:02 UTC
git commit: Rename openstack cartridge files
Updated Branches:
refs/heads/master 2ab356a95 -> 42ab44f6e
Rename openstack cartridge files
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/42ab44f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/42ab44f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/42ab44f6
Branch: refs/heads/master
Commit: 42ab44f6e6b1ef81899b4658a3873612055d7a98
Parents: 2ab356a
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Thu Sep 5 16:52:08 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Thu Sep 5 16:52:08 2013 +0530
----------------------------------------------------------------------
.../cartridges/openstack/openstack-mysql.xml | 36 ++++++++++++++++++++
.../cartridges/openstack/openstack-php.xml | 35 +++++++++++++++++++
.../cartridges/openstack/openstack-tomcat.xml | 36 ++++++++++++++++++++
.../cartridges/openstack/openstack_mysql.xml | 36 --------------------
.../cartridges/openstack/openstack_php.xml | 35 -------------------
.../cartridges/openstack/openstack_tomcat.xml | 36 --------------------
6 files changed, 107 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/42ab44f6/tools/stratos-installer/cartridges/openstack/openstack-mysql.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/openstack/openstack-mysql.xml b/tools/stratos-installer/cartridges/openstack/openstack-mysql.xml
new file mode 100644
index 0000000..57257a7
--- /dev/null
+++ b/tools/stratos-installer/cartridges/openstack/openstack-mysql.xml
@@ -0,0 +1,36 @@
+<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
+ <cartridges>
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="mysql" host="mysql.STRATOS_DOMAIN" provider="data" version="5.5" 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>Openstack MySQL</displayName>
+ <description>Openstack MySQL 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>region/image-id</imageId>
+ <property name="keyPair" value="key-pair"/>
+ <property name="instanceType" value="instance-type"/>
+ <property name="securityGroups" value="security-groups"/>
+ </iaasProvider>
+ <deployment baseDir="/var/www">
+ <dir>public=copy#app#files#here</dir>
+ <dir>simplesamlphp=copy#saml#libraries#here</dir>
+ </deployment>
+ <portMapping>
+ <http port="80" proxyPort="8280"/>
+ <https port="443" proxyPort="8243"/>
+ </portMapping>
+ <property name="sshPort" value="22"/>
+ <property name="dataPort" value="3306"/>
+ <!--<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/42ab44f6/tools/stratos-installer/cartridges/openstack/openstack-php.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/openstack/openstack-php.xml b/tools/stratos-installer/cartridges/openstack/openstack-php.xml
new file mode 100644
index 0000000..7ae8780
--- /dev/null
+++ b/tools/stratos-installer/cartridges/openstack/openstack-php.xml
@@ -0,0 +1,35 @@
+<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
+ <cartridges>
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="php" host="php.STRATOS_DOMAIN" provider="zend-provider" version="5.5" 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>Openstack PHP</displayName>
+ <description>Openstack PHP 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>region/image-id</imageId>
+ <property name="keyPair" value="key-pair"/>
+ <property name="instanceType" value="instance-type"/>
+ <property name="securityGroups" value="security-groups"/>
+ </iaasProvider>
+ <deployment baseDir="/var/www">
+ <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="80" proxyPort="8280"/>
+ <https port="443" 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/42ab44f6/tools/stratos-installer/cartridges/openstack/openstack-tomcat.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/openstack/openstack-tomcat.xml b/tools/stratos-installer/cartridges/openstack/openstack-tomcat.xml
new file mode 100644
index 0000000..ec576ed
--- /dev/null
+++ b/tools/stratos-installer/cartridges/openstack/openstack-tomcat.xml
@@ -0,0 +1,36 @@
+<!-- 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.apache.org" 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>Openstack Tomcat</displayName>
+ <description>Openstack 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>region/image-id</imageId>
+ <property name="keyPair" value="key-pait"/>
+ <property name="instanceType" value="instance-type"/>
+ <property name="securityGroups" value="security-groups"/>
+ <!--<property name="payload" value="payload-file-path"/>-->
+ </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/42ab44f6/tools/stratos-installer/cartridges/openstack/openstack_mysql.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/openstack/openstack_mysql.xml b/tools/stratos-installer/cartridges/openstack/openstack_mysql.xml
deleted file mode 100644
index 57257a7..0000000
--- a/tools/stratos-installer/cartridges/openstack/openstack_mysql.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="mysql" host="mysql.STRATOS_DOMAIN" provider="data" version="5.5" 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>Openstack MySQL</displayName>
- <description>Openstack MySQL 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>region/image-id</imageId>
- <property name="keyPair" value="key-pair"/>
- <property name="instanceType" value="instance-type"/>
- <property name="securityGroups" value="security-groups"/>
- </iaasProvider>
- <deployment baseDir="/var/www">
- <dir>public=copy#app#files#here</dir>
- <dir>simplesamlphp=copy#saml#libraries#here</dir>
- </deployment>
- <portMapping>
- <http port="80" proxyPort="8280"/>
- <https port="443" proxyPort="8243"/>
- </portMapping>
- <property name="sshPort" value="22"/>
- <property name="dataPort" value="3306"/>
- <!--<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/42ab44f6/tools/stratos-installer/cartridges/openstack/openstack_php.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/openstack/openstack_php.xml b/tools/stratos-installer/cartridges/openstack/openstack_php.xml
deleted file mode 100644
index 7ae8780..0000000
--- a/tools/stratos-installer/cartridges/openstack/openstack_php.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php" host="php.STRATOS_DOMAIN" provider="zend-provider" version="5.5" 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>Openstack PHP</displayName>
- <description>Openstack PHP 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>region/image-id</imageId>
- <property name="keyPair" value="key-pair"/>
- <property name="instanceType" value="instance-type"/>
- <property name="securityGroups" value="security-groups"/>
- </iaasProvider>
- <deployment baseDir="/var/www">
- <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="80" proxyPort="8280"/>
- <https port="443" 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/42ab44f6/tools/stratos-installer/cartridges/openstack/openstack_tomcat.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/openstack/openstack_tomcat.xml b/tools/stratos-installer/cartridges/openstack/openstack_tomcat.xml
deleted file mode 100644
index ec576ed..0000000
--- a/tools/stratos-installer/cartridges/openstack/openstack_tomcat.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- 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.apache.org" 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>Openstack Tomcat</displayName>
- <description>Openstack 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>region/image-id</imageId>
- <property name="keyPair" value="key-pait"/>
- <property name="instanceType" value="instance-type"/>
- <property name="securityGroups" value="security-groups"/>
- <!--<property name="payload" value="payload-file-path"/>-->
- </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>