From d49fd75750cc894f0b8ab118f001b9ef8e0c0a17 Mon Sep 17 00:00:00 2001
From: Kevin Zhao <kevin.zhao@arm.com>
Date: Wed, 23 Aug 2017 12:43:35 +0800
Subject: [PATCH] Bump Kubernetes version from 1.7.3 to 1.7.4

Tweak setup document about set env

Implements: blueprint upgrade-kubernetes

Change-Id: Ib6c25c9affcf7020aaf127220dad7e07f9b518ff
Signed-off-by: Kevin Zhao <kevin.zhao@arm.com>
---
 devstack/plugin.sh   | 6 +++---
 doc/source/setup.rst | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 45a5013..7d7d0e1 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -97,15 +97,15 @@ gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
 EOF'
         sudo setenforce 0
         sudo sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config
-        sudo yum install -y kubelet-1.7.3-1 kubeadm-1.7.3-1 kubectl-1.7.3-1
+        sudo yum install -y kubelet-1.7.4-0 kubeadm-1.7.4-0 kubectl-1.7.4-0
     elif is_ubuntu; then
         sudo apt-get update && sudo apt-get install -y apt-transport-https
         sudo curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
-        sudo sh -c 'cat > /etc/apt/sources.list.d/kubernetes.list <<EOF 
+        sudo sh -c 'cat > /etc/apt/sources.list.d/kubernetes.list <<EOF
 deb http://apt.kubernetes.io/ kubernetes-xenial main
 EOF'
         sudo apt-get update
-        sudo apt-get install -y kubelet=1.7.3-01 kubeadm=1.7.3-01 kubectl=1.7.3-01
+        sudo apt-get install -y kubelet=1.7.4-00 kubeadm=1.7.4-00 kubectl=1.7.4-00
     else
         exit_distro_not_supported
     fi
diff --git a/doc/source/setup.rst b/doc/source/setup.rst
index 7be3553..f56d6f3 100644
--- a/doc/source/setup.rst
+++ b/doc/source/setup.rst
@@ -45,8 +45,8 @@ Start installation:
 Setup environment variables for kubectl and openstack client:
 ::
 
-  export KUBECONFIG=/etc/kubernetes/admin.conf 
-  source openrc admin admin
+  export KUBECONFIG=/opt/stack/admin.conf
+  source /opt/stack/devstack/openrc admin admin
 
 ================
 Add a new node