优化storage结构,修复deploy节点分离nas部署失败

pull/281/merge
lusyoe 2018-08-05 21:17:10 +08:00 committed by jmgao
parent be08287672
commit 7119c70005
2 changed files with 14 additions and 2 deletions

View File

@ -1,21 +1,33 @@
- block: - block:
- name: 准备nfs-client 配置目录 - name: 准备nfs-client 配置目录
file: name={{ base_dir }}/manifests/storage/nfs state=directory file: name={{ base_dir }}/manifests/storage/nfs state=directory
- name: 准备部署nfs-client动态存储
- name: 生成nfs-client动态存储配置
template: template:
src: nfs/nfs-client-provisioner.yaml.j2 src: nfs/nfs-client-provisioner.yaml.j2
dest: "{{ base_dir }}/manifests/storage/nfs/{{ nfs_provisioner_name }}.yaml" dest: "{{ base_dir }}/manifests/storage/nfs/{{ nfs_provisioner_name }}.yaml"
- name: 开始部署nfs-client动态存储 - name: 开始部署nfs-client动态存储
shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/nfs/{{ nfs_provisioner_name }}.yaml" shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/nfs/{{ nfs_provisioner_name }}.yaml"
when: 'storage_nfs_enabled == "yes"' when: 'storage_nfs_enabled == "yes"'
- block: - block:
- name: 准备部署alicloud-nas动态存储 - name: 准备alicloud-nas配置目录
file: name={{ base_dir }}/manifests/storage/alicloud-nas state=directory
- name: 生成alicloud-nas动态存储配置
template: template:
src: alicloud-nas/alicloud-nas.yaml.j2 src: alicloud-nas/alicloud-nas.yaml.j2
dest: "{{ base_dir }}/manifests/storage/alicloud-nas/{{ aliyun_nas_controller_name }}.yaml" dest: "{{ base_dir }}/manifests/storage/alicloud-nas/{{ aliyun_nas_controller_name }}.yaml"
- name: 复制alicloud-disk配置
copy:
src: alicloud-disk.yaml
dest: "{{ base_dir }}/manifests/storage/alicloud-nas/alicloud-disk.yaml"
- name: 开始部署alicloud-disk存储 - name: 开始部署alicloud-disk存储
shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/alicloud-nas/alicloud-disk.yaml" shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/alicloud-nas/alicloud-disk.yaml"
- name: 开始部署alicloud-nas动态存储 - name: 开始部署alicloud-nas动态存储
shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/alicloud-nas/{{ aliyun_nas_controller_name }}.yaml" shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/alicloud-nas/{{ aliyun_nas_controller_name }}.yaml"
when: 'storage_aliyun_nas_enabled == "yes"' when: 'storage_aliyun_nas_enabled == "yes"'