diff options
| -rw-r--r-- | group_vars/k8s-emc/vars.yml (renamed from group_vars/k8s-stream/vars.yml) | 0 | ||||
| -rw-r--r-- | hosts.ini | 20 | ||||
| -rw-r--r-- | playbooks/k8s-emc.yaml (renamed from playbooks/k8s-stream.yaml) | 12 | ||||
| -rw-r--r-- | roles/docker/tasks/main.yaml | 4 | ||||
| -rw-r--r-- | roles/kubernetes-base/tasks/main.yaml | 4 | ||||
| -rw-r--r-- | roles/vm-install/templates/libvirt-domain.xml.j2 | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/group_vars/k8s-stream/vars.yml b/group_vars/k8s-emc/vars.yml index 679c5181..679c5181 100644 --- a/group_vars/k8s-stream/vars.yml +++ b/group_vars/k8s-emc/vars.yml @@ -59,25 +59,25 @@ emc-test [scaleway:children] emc-xx -[k8s-stream-encoder] +[k8s-emc-encoder] dione helene -# [k8s-stream-streamer] +# [k8s-emc-streamer] # emc-test -[k8s-stream-streamer:children] +[k8s-emc-streamer:children] emc-xx -[k8s-stream-master] +[k8s-emc-master] dione #emc-master -[k8s-stream-stats] +[k8s-emc-stats] emc-stats -[k8s-stream:children] -k8s-stream-master -k8s-stream-encoder -k8s-stream-streamer -k8s-stream-stats +[k8s-emc:children] +k8s-emc-master +k8s-emc-encoder +k8s-emc-streamer +k8s-emc-stats diff --git a/playbooks/k8s-stream.yaml b/playbooks/k8s-emc.yaml index ec2d2748..17aa3510 100644 --- a/playbooks/k8s-stream.yaml +++ b/playbooks/k8s-emc.yaml @@ -1,13 +1,13 @@ --- - name: prepare cluster config - hosts: k8s-stream + hosts: k8s-emc gather_facts: no run_once: yes tasks: - name: configure node lists set_fact: - kubernetes_nodes: "{{ groups['k8s-stream'] }}" - kubernetes_nodes_master: "{{ groups['k8s-stream-master'] | first }}" + kubernetes_nodes: "{{ groups['k8s-emc'] }}" + kubernetes_nodes_master: "{{ groups['k8s-emc-master'] | first }}" - name: check if every node has a net_index assigned debug: @@ -15,7 +15,7 @@ failed_when: kubernetes_nodes | difference(kubernetes.net_index.keys()) | length > 0 - name: install kubernetes and overlay network - hosts: k8s-stream + hosts: k8s-emc roles: ## Since `base` has a dependency for docker it would install and start the daemon ## without the docker daemon config file generated by `net`. @@ -27,12 +27,12 @@ - role: kubernetes-base - name: configure kubernetes master - hosts: k8s-stream-master + hosts: k8s-emc-master roles: - role: kubernetes-master - name: configure kubernetes nodes - hosts: k8s-stream:!k8s-stream-master + hosts: k8s-emc:!k8s-emc-master roles: - role: kubernetes-node diff --git a/roles/docker/tasks/main.yaml b/roles/docker/tasks/main.yaml index 2604dead..2253f1ed 100644 --- a/roles/docker/tasks/main.yaml +++ b/roles/docker/tasks/main.yaml @@ -12,11 +12,11 @@ - name: create filesystem filesystem: fstype: "{{ docker_lvm.fs }}" - dev: "/dev/mapper/{{ docker_lvm.vg }}-{{ docker_lvm.lv }}" + dev: "/dev/mapper/{{ docker_lvm.vg | replace('-', '--') }}-{{ docker_lvm.lv | replace('-', '--') }}" - name: mount filesytem mount: - src: "/dev/mapper/{{ docker_lvm.vg }}-{{ docker_lvm.lv }}" + src: "/dev/mapper/{{ docker_lvm.vg | replace('-', '--') }}-{{ docker_lvm.lv | replace('-', '--') }}" path: /var/lib/docker fstype: "{{ docker_lvm.fs }}" state: mounted diff --git a/roles/kubernetes-base/tasks/main.yaml b/roles/kubernetes-base/tasks/main.yaml index 171375dd..3cc9cecf 100644 --- a/roles/kubernetes-base/tasks/main.yaml +++ b/roles/kubernetes-base/tasks/main.yaml @@ -12,11 +12,11 @@ - name: create filesystem filesystem: fstype: "{{ kubelet_lvm.fs }}" - dev: "/dev/mapper/{{ kubelet_lvm.vg }}-{{ kubelet_lvm.lv }}" + dev: "/dev/mapper/{{ kubelet_lvm.vg | replace('-', '--') }}-{{ kubelet_lvm.lv | replace('-', '--') }}" - name: mount filesytem mount: - src: "/dev/mapper/{{ kubelet_lvm.vg }}-{{ kubelet_lvm.lv }}" + src: "/dev/mapper/{{ kubelet_lvm.vg | replace('-', '--') }}-{{ kubelet_lvm.lv | replace('-', '--') }}" path: /var/lib/kubelet fstype: "{{ kubelet_lvm.fs }}" state: mounted diff --git a/roles/vm-install/templates/libvirt-domain.xml.j2 b/roles/vm-install/templates/libvirt-domain.xml.j2 index 5546fd44..c84b1045 100644 --- a/roles/vm-install/templates/libvirt-domain.xml.j2 +++ b/roles/vm-install/templates/libvirt-domain.xml.j2 @@ -33,7 +33,7 @@ {% for device, lv in vm_install.disks.virtio.items() %} <disk type='block' device='disk'> <driver name='qemu' type='raw' cache='none' discard='unmap'/> - <source dev='/dev/mapper/{{ lv.vg }}-{{ lv.lv | replace('-', '--') }}'/> + <source dev='/dev/mapper/{{ lv.vg | replace('-', '--') }}-{{ lv.lv | replace('-', '--') }}'/> <target dev='{{ device }}' bus='virtio'/> </disk> {% endfor %} @@ -44,7 +44,7 @@ {% for device, lv in vm_install.disks.scsi.items() %} <disk type='block' device='disk'> <driver name='qemu' type='raw' cache='none' discard='unmap'/> - <source dev='/dev/mapper/{{ lv.vg }}-{{ lv.lv | replace('-', '--') }}'/> + <source dev='/dev/mapper/{{ lv.vg | replace('-', '--') }}-{{ lv.lv | replace('-', '--') }}'/> <target dev='{{ device }}' bus='scsi'/> </disk> {% endfor %} |