x/stackube
Code Issues Proposed changes

Fix deploy nits

Browse Source 
Change-Id: I2e833301b46d55607d8a6129e58d4c70376d87bd
This commit is contained in:
Harry Zhang 2017-08-17 21:33:29 +08:00
parent c7a2eeca04
commit ca41a68e0b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/flexvolume/flexvolume-ds.yaml
View File

@ -44,7 +44,7 @@ spec:
containers: containers:
- name: cinder-flexvolume - name: cinder-flexvolume
resources: {} resources: {}
image: stackube/flex-volume:v1.0 image: stackube/flex-volume:v0.1
command: ["/bin/bash", "install.sh"] command: ["/bin/bash", "install.sh"]
env: env:
# The endpoint of openstack authentication. # The endpoint of openstack authentication.

5
devstack/plugin.sh
View File

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
STACKUBE_ROOT=$(dirname "${BASH_SOURCE}") STACKUBE_ROOT=$(dirname "${BASH_SOURCE}")
# TODO(harry) clone frakti? or maintain yaml?
FRAKTI_ROOT=${}
function install_docker { function install_docker {
if is_ubuntu; then if is_ubuntu; then
@ -226,6 +224,9 @@ function init_stackube {
install_master install_master
install_stackube_addons install_stackube_addons
install_flexvolume_plugin 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 elif is_service_enabled kubernetes_node; then
install_node install_node
fi fi