parallelvirtualcluster
/
pvc-ansible
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reorganize some elements

This commit is contained in:
Joshua Boniface 2019-06-12 23:22:47 -04:00
parent cde6a188ba
commit c092362f13
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/pvc/tasks/ceph/bootstrap.yml
View File

@ -57,12 +57,7 @@
command: ceph-authtool /tmp/ceph-bootstrap/ceph.mon.keyring --import-keyring /tmp/ceph-bootstrap/ceph.osd.bootstrap.keyring command: ceph-authtool /tmp/ceph-bootstrap/ceph.mon.keyring --import-keyring /tmp/ceph-bootstrap/ceph.osd.bootstrap.keyring
- name: create monmap - name: create monmap
command: monmaptool --create --fsid {{ fsid }} /tmp/ceph-bootstrap/monmap command: monmaptool --create --fsid {{ fsid }} {% for node in pvc_nodes if node.is_coordinator %}--add {{ node.hostname }} {{ node.cluster_ip }} {% endfor %} /tmp/ceph-bootstrap/monmap
- name: add monitors to monmap
command: monmaptool --add {{ item.hostname }} {{ item.cluster_ip }} --fsid {{ fsid }} /tmp/ceph-bootstrap/monmap
with_items:
- "{{ pvc_nodes }}"
- name: copy initial ceph.conf to the boostrap directory - name: copy initial ceph.conf to the boostrap directory
copy: copy:

2
roles/pvc/tasks/ceph/main.yml
View File

@ -61,7 +61,7 @@
when: newhost is defined and newhost when: newhost is defined and newhost
- name: populate monitor with map and keys - name: populate monitor with map and keys
command: ceph-mon --mkfs -i {{ ansible_hostname }} --monmap /etc/ceph/monmap --keyring /etc/ceph/ceph.mon.keyring command: ceph-mon --cluster ceph --mkfs -i {{ ansible_hostname }} --monmap /etc/ceph/monmap --keyring /etc/ceph/ceph.mon.keyring
become_user: ceph become_user: ceph
when: newhost is defined and newhost when: newhost is defined and newhost

8
roles/pvc/tasks/main.yml
View File

@ -6,14 +6,17 @@
args: args:
creates: /etc/pvc-install creates: /etc/pvc-install
register: newhost_check register: newhost_check
tags: always
- name: set newhost fact - name: set newhost fact
set_fact: set_fact:
newhost: yes newhost: yes
when: newhost_check.changed when: newhost_check.changed
tags: always
- include: common/add_cluster_ips.yml - include: common/add_cluster_ips.yml
when: newhost is defined and newhost when: newhost is defined and newhost
tags: always
# General blacklisting of modules # General blacklisting of modules
- name: add module blacklist - name: add module blacklist
@ -38,12 +41,13 @@
- include: frr/main.yml - include: frr/main.yml
tags: pvc-frr tags: pvc-frr
- include: remove_cluster_ips.yml - include: common/remove_cluster_ips.yml
when: newhost is defined and newhost when: newhost is defined and newhost
# tags: always
# Install PVC sequentially # Install PVC sequentially
- include: pvc/main.yml - include: pvc/main.yml
tags: pvc-pvc tags: pvc-daemon
run_once: true run_once: true
delegate_to: "{{ play_host }}" delegate_to: "{{ play_host }}"
with_items: "{{ play_hosts }}" with_items: "{{ play_hosts }}"