From ca41a68e0b7ddaeb022a9ae63d4fe038dae0da6a Mon Sep 17 00:00:00 2001
From: Harry Zhang <harryz@hyper.sh>
Date: Thu, 17 Aug 2017 21:33:29 +0800
Subject: [PATCH] Fix deploy nits

Change-Id: I2e833301b46d55607d8a6129e58d4c70376d87bd
---
 deployment/flexvolume/flexvolume-ds.yaml | 2 +-
 devstack/plugin.sh                       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/deployment/flexvolume/flexvolume-ds.yaml b/deployment/flexvolume/flexvolume-ds.yaml
index de14f4d..fda0000 100644
--- a/deployment/flexvolume/flexvolume-ds.yaml
+++ b/deployment/flexvolume/flexvolume-ds.yaml
@@ -44,7 +44,7 @@ spec:
       containers:
         - name: cinder-flexvolume
           resources: {}
-          image: stackube/flex-volume:v1.0
+          image: stackube/flex-volume:v0.1
           command: ["/bin/bash", "install.sh"]
           env:
             # The endpoint of openstack authentication.
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index c2ec32e..45a5013 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -14,8 +14,6 @@
 # limitations under the License.
 
 STACKUBE_ROOT=$(dirname "${BASH_SOURCE}")
-# TODO(harry) clone frakti? or maintain yaml?
-FRAKTI_ROOT=${}
 
 function install_docker {
     if is_ubuntu; then
@@ -226,6 +224,9 @@ function init_stackube {
         install_master
         install_stackube_addons
         install_flexvolume_plugin
+        # approve kublelet's csr for the node.
+        # TODO(harry) what if in multi-node cluster?
+        kubectl certificate approve $(kubectl get csr | awk '/^csr/{print $1}')
     elif is_service_enabled kubernetes_node; then
         install_node
     fi