You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/08/20 07:47:15 UTC
git commit: This closes #13
Repository: stratos
Updated Branches:
refs/heads/master fac5d38c2 -> 395994d3b
This closes #13
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/395994d3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/395994d3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/395994d3
Branch: refs/heads/master
Commit: 395994d3b3365eba7264be3a8ba4d52295d65057
Parents: fac5d38
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Aug 20 11:16:39 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Aug 20 11:16:39 2014 +0530
----------------------------------------------------------------------
.../config/all/repository/conf/cloud-controller.xml | 2 ++
.../config/cc/repository/conf/cloud-controller.xml | 2 ++
tools/stratos-installer/openstack.sh | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/395994d3/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml b/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml
index 7f73a09..b71a1fe 100644
--- a/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml
+++ b/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml
@@ -70,6 +70,8 @@
<property name="jclouds.api-version" value="2.0/" />
<property name="X" value="x" />
<property name="Y" value="y" />
+ <property name="securityGroups" value="OPENSTACK_SECURITY_GROUPS"/>
+ <property name="keyPair" value="OPENSTACK_KEYPAIR"/>
</iaasProviderOPENSTACK_PROVIDER_END>
<VCLOUD_PROVIDER_STARTiaasProvider type="vcloud" name="VMware vCloud specific details">
<className>org.apache.stratos.cloud.controller.iaases.VCloudIaas</className>
http://git-wip-us.apache.org/repos/asf/stratos/blob/395994d3/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml b/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml
index 3561e0f..bd94e6c 100644
--- a/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml
+++ b/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml
@@ -71,6 +71,8 @@
<property name="jclouds.api-version" value="2.0/" />
<property name="X" value="x" />
<property name="Y" value="y" />
+ <property name="securityGroups" value="OPENSTACK_SECURITY_GROUPS"/>
+ <property name="keyPair" value="OPENSTACK_KEYPAIR"/>
</iaasProviderOPENSTACK_PROVIDER_END>
<VCLOUD_PROVIDER_STARTiaasProvider type="vcloud" name="VMware vCloud specific details">
<className>org.apache.stratos.cloud.controller.iaases.VCloudIaas</className>
http://git-wip-us.apache.org/repos/asf/stratos/blob/395994d3/tools/stratos-installer/openstack.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/openstack.sh b/tools/stratos-installer/openstack.sh
index dae8689..c40d39f 100755
--- a/tools/stratos-installer/openstack.sh
+++ b/tools/stratos-installer/openstack.sh
@@ -46,6 +46,8 @@ sed -i "s@OPENSTACK_IDENTITY@$openstack_identity@g" repository/conf/cloud-contr
sed -i "s@OPENSTACK_CREDENTIAL@$openstack_credential@g" repository/conf/cloud-controller.xml
sed -i "s@OPENSTACK_ENDPOINT@$openstack_jclouds_endpoint@g" repository/conf/cloud-controller.xml
sed -i "s@OPENSTACK_PROVIDER_END@@g" repository/conf/cloud-controller.xml
+sed -i "s@OPENSTACK_SECURITY_GROUPS@$openstack_security_groups@g" repository/conf/cloud-controller.xml
+sed -i "s@OPENSTACK_KEYPAIR@$openstack_keypair_name@g" repository/conf/cloud-controller.xml
sed -i "s@EC2_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
sed -i "s@EC2_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
sed -i "s@VCLOUD_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml