openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Run OpenShift 3.7.1 in DevStack plugin"

This commit is contained in:
Zuul 2018-02-22 06:12:16 +00:00 committed by Gerrit Code Review
parent 48baed57d9 b13da77708
commit cc555b85df
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/kuryr_kubernetes
View File

@ -658,7 +658,8 @@ function run_openshift_node {
command="/usr/local/bin/openshift start node \
--kubeconfig=${OPENSHIFT_DATA_DIR}/master.kubelet-client.kubeconfig \
--enable=kubelet,plugins \
--network-plugin=cni"
--network-plugin=cni \
--listen=https://0.0.0.0:8442"
# Link master config necessary for bootstrapping
# TODO: This needs to be generated so we don't depend on it on multinode

2
devstack/plugin.sh
View File

@ -427,7 +427,7 @@ function wait_for {
fi
local start_time=$(date +%s)
until curl -o /dev/null -sIf $extra_flags "$url"; do
until curl -o /dev/null -sf $extra_flags "$url"; do
echo -n "."
local curr_time=$(date +%s)
local time_diff=$(($curr_time - $start_time))

2
devstack/settings
View File

@ -47,7 +47,7 @@ KURYR_K8S_API_CACERT=${KURYR_K8S_API_CACERT:-}
KURYR_PORT_DEBUG=${KURYR_PORT_DEBUG:-True}
# OpenShift
OPENSHIFT_BINARY_URL=${OPENSHIFT_BINARY_URL:-https://github.com/openshift/origin/releases/download/v3.6.0/openshift-origin-server-v3.6.0-c4dd4cf-linux-64bit.tar.gz}
OPENSHIFT_BINARY_URL=${OPENSHIFT_BINARY_URL:-https://github.com/openshift/origin/releases/download/v3.7.1/openshift-origin-server-v3.7.1-ab0f056-linux-64bit.tar.gz}
OPENSHIFT_HOME=${OPENSHIFT_HOME:-$DEST/openshift}
OPENSHIFT_DATA_DIR=${OPENSHIFT_DATA_DIR:-${DATA_DIR}/openshift}
OPENSHIFT_API_URL=${OPENSHIFT_API_URL:-https://${HOST_IP}:8443}