You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/12/03 21:17:20 UTC
stratos git commit: adding openstack_networking_provider property in
cc xml
Repository: stratos
Updated Branches:
refs/heads/master def7d3f14 -> e36f2be32
adding openstack_networking_provider property in cc xml
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e36f2be3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e36f2be3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e36f2be3
Branch: refs/heads/master
Commit: e36f2be32d15df04a5288243e5e72ff4f64377c0
Parents: def7d3f
Author: R-Rajkumar <rr...@gmail.com>
Authored: Thu Dec 4 01:46:59 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Thu Dec 4 01:46:59 2014 +0530
----------------------------------------------------------------------
.../src/main/resources/conf/cloud-controller.xml | 1 +
tools/stratos-installer/conf/setup.conf | 2 ++
.../config/all/repository/conf/cloud-controller.xml | 1 +
.../config/cc/repository/conf/cloud-controller.xml | 1 +
tools/stratos-installer/openstack.sh | 1 +
5 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e36f2be3/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
index 76ac074..8817d9a 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
@@ -57,6 +57,7 @@
<property name="jclouds.endpoint" value="http://192.168.16.20:5000/" />
<property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
<property name="jclouds.api-version" value="2.0/" />
+ <property name="openstack.networking.provider" value="nova" />
<property name="X" value="x" />
<property name="Y" value="y" />
</iaasProvider -->
http://git-wip-us.apache.org/repos/asf/stratos/blob/e36f2be3/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index 6f2a960..acdc39b 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -87,6 +87,8 @@ export openstack_credential="password" # Openstack login password
export openstack_jclouds_endpoint="http://hostname:5000/v2.0"
export openstack_keypair_name=""
export openstack_security_groups=""
+# default to nova. If you have neutron networking environment, set it to neutron
+export openstack_networking_provider="nova"
# vCloud
export vcloud_provider_enabled=false
http://git-wip-us.apache.org/repos/asf/stratos/blob/e36f2be3/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 20cfcc7..ee8ffe8 100644
--- a/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml
+++ b/tools/stratos-installer/config/all/repository/conf/cloud-controller.xml
@@ -68,6 +68,7 @@
<property name="jclouds.endpoint" value="OPENSTACK_ENDPOINT" />
<property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
<property name="jclouds.api-version" value="2.0/" />
+ <property name="openstack.networking.provider" value="OPENSTACK_NETWORKING_PROVIDER" />
<property name="X" value="x" />
<property name="Y" value="y" />
<property name="securityGroups" value="OPENSTACK_SECURITY_GROUPS"/>
http://git-wip-us.apache.org/repos/asf/stratos/blob/e36f2be3/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 7a2f220..73369f1 100644
--- a/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml
+++ b/tools/stratos-installer/config/cc/repository/conf/cloud-controller.xml
@@ -69,6 +69,7 @@
<property name="jclouds.endpoint" value="OPENSTACK_ENDPOINT" />
<property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
<property name="jclouds.api-version" value="2.0/" />
+ <property name="openstack.networking.provider" value="OPENSTACK_NETWORKING_PROVIDER" />
<property name="X" value="x" />
<property name="Y" value="y" />
<property name="securityGroups" value="OPENSTACK_SECURITY_GROUPS"/>
http://git-wip-us.apache.org/repos/asf/stratos/blob/e36f2be3/tools/stratos-installer/openstack.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/openstack.sh b/tools/stratos-installer/openstack.sh
index ad75cb8..5ac36c1 100755
--- a/tools/stratos-installer/openstack.sh
+++ b/tools/stratos-installer/openstack.sh
@@ -54,6 +54,7 @@ ${SED} -i "s@OPENSTACK_PROVIDER_START@@g" repository/conf/cloud-controller.xml
${SED} -i "s@OPENSTACK_IDENTITY@$openstack_identity@g" repository/conf/cloud-controller.xml
${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_NETWORKING_PROVIDER@$openstack_networking_provider@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