You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/02/14 15:25:22 UTC
[4/4] stratos git commit: Kubernetes.sh provider specific info added
Kubernetes.sh provider specific info added
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/aa0ef428
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/aa0ef428
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/aa0ef428
Branch: refs/heads/master
Commit: aa0ef428ab034d56a25a619a5dd0d7bd3c2eea6f
Parents: 187a247
Author: Supun Muthutantri <su...@wso2.com>
Authored: Fri Feb 13 11:36:56 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Feb 14 19:55:11 2015 +0530
----------------------------------------------------------------------
tools/stratos-installer/ec2.sh | 2 +
tools/stratos-installer/gce.sh | 2 +
tools/stratos-installer/kubernetes.sh | 68 ++++++++++++++++++++++++++++++
tools/stratos-installer/openstack.sh | 2 +
tools/stratos-installer/setup.sh | 11 ++++-
tools/stratos-installer/vcloud.sh | 2 +
6 files changed, 86 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa0ef428/tools/stratos-installer/ec2.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/ec2.sh b/tools/stratos-installer/ec2.sh
index 8482866..9b49a72 100755
--- a/tools/stratos-installer/ec2.sh
+++ b/tools/stratos-installer/ec2.sh
@@ -64,6 +64,8 @@ ${SED} -i "s@VCLOUD_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
${SED} -i "s@VCLOUD_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
${SED} -i "s@GCE_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
${SED} -i "s@GCE_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
popd
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa0ef428/tools/stratos-installer/gce.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/gce.sh b/tools/stratos-installer/gce.sh
index 3cd9039..4689d8a 100755
--- a/tools/stratos-installer/gce.sh
+++ b/tools/stratos-installer/gce.sh
@@ -63,5 +63,7 @@ ${SED} -i "s@GCE_IDENTITY@${gce_identity//@/\\@}@g" repository/conf/cloud-contro
${SED} -i "s@GCE_CREDENTIAL@${gce_credential//$'\n'/\\n}@g" repository/conf/cloud-controller.xml
${SED} -i "s/GCE_PROJECTNAME/$gce_projectname/g" repository/conf/cloud-controller.xml
${SED} -i "s@GCE_PROVIDER_END@@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
popd
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa0ef428/tools/stratos-installer/kubernetes.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/kubernetes.sh b/tools/stratos-installer/kubernetes.sh
new file mode 100755
index 0000000..a7dbdba
--- /dev/null
+++ b/tools/stratos-installer/kubernetes.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+# ----------------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# ----------------------------------------------------------------------------
+#
+# This script is invoked by setup.sh for configuring KUBERNETES IaaS information.
+# ----------------------------------------------------------------------------
+
+# Die on any error:
+set -e
+
+# General commands
+if [ "$(uname)" == "Darwin" ]; then
+ # Do something under Mac OS X platform
+ SED=`which gsed` && : || (echo "Command 'gsed' is not installed."; exit 10;)
+else
+ # Do something else under some other platform
+ SED=`which sed` && : || (echo "Command 'sed' is not installed."; exit 10;)
+fi
+
+SLEEP=60
+export LOG=$log_path/stratos-kubernetes.log
+
+source "./conf/setup.conf"
+
+stratos_extract_path=$1
+
+if [[ ! -d $log_path ]]; then
+ mkdir -p $log_path
+fi
+
+pushd $stratos_extract_path
+
+echo "Set KUBERNETES provider specific info in repository/conf/cloud-controller.xml" >> $LOG
+
+${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@OPENSTACK_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@OPENSTACK_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@VCLOUD_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@VCLOUD_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@GCE_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@GCE_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_START@@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_IDENTITY@$kubernetes_identity@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_CREDENTIAL@$kubernetes_credential@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_END@@g" repository/conf/cloud-controller.xml
+
+
+popd
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa0ef428/tools/stratos-installer/openstack.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/openstack.sh b/tools/stratos-installer/openstack.sh
index 5ac36c1..a955a3e 100755
--- a/tools/stratos-installer/openstack.sh
+++ b/tools/stratos-installer/openstack.sh
@@ -64,5 +64,7 @@ ${SED} -i "s@VCLOUD_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
${SED} -i "s@VCLOUD_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
${SED} -i "s@GCE_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
${SED} -i "s@GCE_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
popd
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa0ef428/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 39ddf29..742123f 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -193,7 +193,7 @@ function cc_related_popup() {
function cc_conf_validate() {
if [[ $ec2_provider_enabled = "false" && $openstack_provider_enabled = "false" && $vcloud_provider_enabled = "false" \
- && $gce_provider_enabled = "false" ]]; then
+ && $gce_provider_enabled = "false" && $kubernetes_provider_enabled = "false" ]]; then
echo "Please enable at least one of the IaaS providers in conf/setup.conf file"
exit 1
fi
@@ -221,6 +221,12 @@ function cc_conf_validate() {
exit 1
fi
fi
+ if [[ $kubernetes_provider_enabled = "true" ]]; then
+ if [[ ( -z $kubernetes_identity || -z $kubernetes_credential ) ]]; then
+ echo "Please set Kubernetes configuration information in conf/setup.conf file"
+ exit 1
+ fi
+ fi
}
# Setup cc
@@ -244,6 +250,9 @@ function cc_setup() {
if [[ $gce_provider_enabled = true ]]; then
./gce.sh $stratos_extract_path
fi
+ if [[ $kubernetes_provider_enabled = true ]]; then
+ ./kubernetes.sh $stratos_extract_path
+ fi
pushd $stratos_extract_path
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa0ef428/tools/stratos-installer/vcloud.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/vcloud.sh b/tools/stratos-installer/vcloud.sh
index ee9a082..80817cb 100755
--- a/tools/stratos-installer/vcloud.sh
+++ b/tools/stratos-installer/vcloud.sh
@@ -61,5 +61,7 @@ ${SED} -i "s@OPENSTACK_PROVIDER_START@!--@g" repository/conf/cloud-controller.xm
${SED} -i "s@OPENSTACK_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
${SED} -i "s@GCE_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
${SED} -i "s@GCE_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_START@!--@g" repository/conf/cloud-controller.xml
+${SED} -i "s@KUBERNETES_PROVIDER_END@--@g" repository/conf/cloud-controller.xml
popd