diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2022-02-01 14:12:18 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2022-02-10 12:15:54 +0000 |
| commit | 496a3df95f040243439b9514d6158e59dc297c88 (patch) | |
| tree | d1e37bb03a2761602ab0d4dcdd3728db850c0241 | |
| parent | 7f2d203354725fdf8ebcb3ecc14fa4937043aba5 (diff) | |
| download | kolla-ansible-496a3df95f040243439b9514d6158e59dc297c88.tar.gz kolla-ansible-496a3df95f040243439b9514d6158e59dc297c88.zip | |
CI: Bump Ceph to Pacific
Change-Id: I9c736a586a757b49170977c7f9cf2c4890557a33
| -rw-r--r-- | roles/cephadm/defaults/main.yml | 7 | ||||
| -rw-r--r-- | roles/cephadm/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/cephadm/templates/cephadm.yml.j2 | 6 | ||||
| -rw-r--r-- | tests/get_logs.sh | 2 |
4 files changed, 18 insertions, 5 deletions
diff --git a/roles/cephadm/defaults/main.yml b/roles/cephadm/defaults/main.yml index 9fe728a73..ccbfb4a5d 100644 --- a/roles/cephadm/defaults/main.yml +++ b/roles/cephadm/defaults/main.yml @@ -1,13 +1,14 @@ --- -cephadm_ceph_apt_repo: "deb http://download.ceph.com/debian-octopus/ {{ ansible_distribution_release }} main" +cephadm_ceph_release: "pacific" +cephadm_ceph_apt_repo: "deb http://download.ceph.com/debian-{{ cephadm_ceph_release }}/ {{ ansible_distribution_release }} main" cephadm_ceph_rpm_repos: - shortname: "ceph" name: "Ceph {{ ansible_architecture }} repository" - url: "http://download.ceph.com/rpm-octopus/el8/{{ ansible_architecture }}/" + url: "http://download.ceph.com/rpm-{{ cephadm_ceph_release }}/el8/{{ ansible_architecture }}/" - shortname: "ceph-noarch" name: "Ceph noarch repository" - url: "http://download.ceph.com/rpm-octopus/el8/noarch/" + url: "http://download.ceph.com/rpm-{{ cephadm_ceph_release }}/el8/noarch/" cephadm_ceph_rpm_gpg_key: http://download.ceph.com/keys/release.gpg diff --git a/roles/cephadm/tasks/main.yml b/roles/cephadm/tasks/main.yml index d8795050e..e2d02615f 100644 --- a/roles/cephadm/tasks/main.yml +++ b/roles/cephadm/tasks/main.yml @@ -49,6 +49,7 @@ --skip-dashboard --skip-firewalld --mon-ip={{ mon_ip }} + --mon-addrv='[v2:{{ mon_ip }}:3300,v1:{{ mon_ip }}:6789]' become: True register: cephadm_bootstrap_output @@ -64,6 +65,13 @@ dest: "/var/run/ceph/{{ ceph_fsid }}/cluster.yml" become: True +- name: Check Ceph Orchestrator state + command: + cmd: > + cephadm shell -- + ceph orch status --detail + become: True + - name: Apply cluster spec command: cmd: > diff --git a/roles/cephadm/templates/cephadm.yml.j2 b/roles/cephadm/templates/cephadm.yml.j2 index 236ede26f..2aee3f819 100644 --- a/roles/cephadm/templates/cephadm.yml.j2 +++ b/roles/cephadm/templates/cephadm.yml.j2 @@ -1,8 +1,10 @@ {% for host in groups['all'] %} --- service_type: host -hostname: {{ host }} -labels: +hostname: {{ hostvars[host]['ansible_hostname'] }} +addr: {{ hostvars[host]['ansible_vxlan0']['ipv4']['address'] }} +labels: +- _admin - mon - mgr - osd diff --git a/tests/get_logs.sh b/tests/get_logs.sh index a6e471cb4..110f40836 100644 --- a/tests/get_logs.sh +++ b/tests/get_logs.sh @@ -88,6 +88,8 @@ copy_logs() { # cephadm related logs mkdir -p ${LOG_DIR}/ceph + sudo cp /etc/ceph/ceph.conf ${LOG_DIR}/ceph + sudo cp -Rf /var/run/ceph/* ${LOG_DIR}/ceph sudo cephadm shell -- ceph --connect-timeout 5 -s > ${LOG_DIR}/ceph/ceph_s.txt sudo cephadm shell -- ceph --connect-timeout 5 osd tree > ${LOG_DIR}/ceph/ceph_osd_tree.txt |