diff --git a/roles/docker/docker-storage/defaults/main.yml b/roles/docker/docker-storage/defaults/main.yml index 38f137bd5..e52e0cc0a 100644 --- a/roles/docker/docker-storage/defaults/main.yml +++ b/roles/docker/docker-storage/defaults/main.yml @@ -3,9 +3,9 @@ docker_container_storage_setup_version: v0.6.0 docker_container_storage_setup_profile_name: kubespray docker_container_storage_setup_storage_driver: devicemapper docker_container_storage_setup_container_thinpool: docker-pool -#It must be define a disk path for docker_container_storage_setup_devs. -#Otherwise docker-storage-setup will be executed incorrectly. -#docker_container_storage_setup_devs: /dev/vdb +# It must be define a disk path for docker_container_storage_setup_devs. +# Otherwise docker-storage-setup will be executed incorrectly. +# docker_container_storage_setup_devs: /dev/vdb docker_container_storage_setup_data_size: 40%FREE docker_container_storage_setup_min_data_size: 2G docker_container_storage_setup_chunk_size: 512K diff --git a/roles/docker/docker-storage/tasks/main.yml b/roles/docker/docker-storage/tasks/main.yml index d61f91284..09f2d70bf 100644 --- a/roles/docker/docker-storage/tasks/main.yml +++ b/roles/docker/docker-storage/tasks/main.yml @@ -31,7 +31,7 @@ group: root mode: 0644 -#https://docs.docker.com/engine/installation/linux/docker-ce/centos/#install-using-the-repository +# https://docs.docker.com/engine/installation/linux/docker-ce/centos/#install-using-the-repository - name: docker-storage-setup | install lvm2 yum: name: lvm2 diff --git a/roles/kubernetes-apps/meta/main.yml b/roles/kubernetes-apps/meta/main.yml index ef64884b9..b1ee4640a 100644 --- a/roles/kubernetes-apps/meta/main.yml +++ b/roles/kubernetes-apps/meta/main.yml @@ -33,7 +33,7 @@ dependencies: - apps - local_volume_provisioner - storage - + # istio role should be last because it takes a long time to initialize and # will cause timeouts trying to start other addons. - role: kubernetes-apps/istio @@ -41,7 +41,7 @@ dependencies: tags: - apps - istio - + - role: kubernetes-apps/persistent_volumes when: persistent_volumes_enabled tags: