openstack
/
magnum
Code Issues Proposed changes

Merge "Fix bashisms in enable-kube scripts"

This commit is contained in:
Jenkins 2016-03-24 01:35:17 +00:00 committed by Gerrit Code Review
parent 6d155cdcda 28e9b6940a
commit e8a108b182
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/templates/kubernetes/fragments/enable-kube-podmaster.sh
View File

@ -2,7 +2,7 @@
. /etc/sysconfig/heat-params
function init_templates {
init_templates () {
local TEMPLATE=/etc/kubernetes/manifests/kube-podmaster.yaml
[ -f ${TEMPLATE} ] || {
echo "TEMPLATE: $TEMPLATE"
@ -58,7 +58,7 @@ EOF
local SERVICE_ACCOUNT_PRIVATE_KEY_FILE=/etc/kubernetes/ssl/server.key
local ROOT_CA_FILE=/etc/kubernetes/ssl/ca.crt
if [ "${TLS_DISABLED}" == "True" ]; then
if [ "${TLS_DISABLED}" = "True" ]; then
SERVICE_ACCOUNT_PRIVATE_KEY_FILE=
ROOT_CA_FILE=
fi

2
magnum/templates/kubernetes/fragments/enable-kube-proxy-master.sh
View File

@ -2,7 +2,7 @@
. /etc/sysconfig/heat-params
function init_templates {
init_templates () {
local TEMPLATE=/etc/kubernetes/manifests/kube-proxy.yaml
[ -f ${TEMPLATE} ] || {
echo "TEMPLATE: $TEMPLATE"

4
magnum/templates/kubernetes/fragments/enable-kube-proxy-minion.sh
View File

@ -2,10 +2,10 @@
. /etc/sysconfig/heat-params
function init_templates {
init_templates () {
local KUBE_PROTOCOL="https"
local KUBE_CONFIG="/srv/kubernetes/kubeconfig.yaml"
if [ "${TLS_DISABLED}" == "True" ]; then
if [ "${TLS_DISABLED}" = "True" ]; then
KUBE_PROTOCOL="http"
KUBE_CONFIG=
fi