aboutsummaryrefslogtreecommitdiff
path: root/roles/cephadm
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2023-01-13 14:51:37 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2023-02-27 09:01:41 +0000
commita6e28f95626754f779ec90a56ee012cff5bb2314 (patch)
tree790d3713e60807526abc195ebb0c9e631b60a5e5 /roles/cephadm
parentad745bf1f84fd75af5522fd09daa95d6d4b45500 (diff)
downloadkolla-ansible-a6e28f95626754f779ec90a56ee012cff5bb2314.tar.gz
kolla-ansible-a6e28f95626754f779ec90a56ee012cff5bb2314.zip
CI: cephadm: Fix EL9 (Rocky)
CentOS Storage SIG rpms have a recommended install section that installs podman - let's stop doing that. Ceph is also suffering from the enormous open files ulimit that EL9 defaults to - let's set a default in docker engine for now. Change-Id: I41f39f520dfecec307ad3b86e1e0363570198e42
Diffstat (limited to 'roles/cephadm')
-rw-r--r--roles/cephadm/tasks/main.yml14
-rw-r--r--roles/cephadm/tasks/pkg_debian.yml6
-rw-r--r--roles/cephadm/tasks/pkg_redhat.yml6
3 files changed, 17 insertions, 9 deletions
diff --git a/roles/cephadm/tasks/main.yml b/roles/cephadm/tasks/main.yml
index 76263a20b..3ce5e4024 100644
--- a/roles/cephadm/tasks/main.yml
+++ b/roles/cephadm/tasks/main.yml
@@ -1,12 +1,6 @@
---
- include_tasks: pkg_{{ ansible_os_family | lower }}.yml
-- name: Install cephadm
- package:
- name: cephadm
- state: present
- become: True
-
- name: Ensure /etc/ceph exists
file:
path: /etc/ceph
@@ -42,13 +36,15 @@
mon_ip: "{{ hostvars[inventory_hostname]['ansible_'+api_interface_name].ipv4.address }}"
command:
cmd: >
- cephadm bootstrap
+ cephadm
+ --docker
+ bootstrap
--ssh-private-key=/etc/ceph/cephadm.id
--ssh-public-key=/etc/ceph/cephadm.pub
--skip-monitoring-stack
--skip-dashboard
--skip-firewalld
- --mon-addrv='[v2:{{ mon_ip }}:3300,v1:{{ mon_ip }}:6789]'
+ --mon-ip {{ mon_ip }}
become: True
register: cephadm_bootstrap_output
@@ -74,7 +70,7 @@
command:
cmd: >
cephadm shell --
- bash /var/run/ceph/commands.sh
+ bash -x /var/run/ceph/commands.sh
become: True
# TODO(mnasiadka): Fix merge_configs to support tabs
diff --git a/roles/cephadm/tasks/pkg_debian.yml b/roles/cephadm/tasks/pkg_debian.yml
index eed23b799..d08895257 100644
--- a/roles/cephadm/tasks/pkg_debian.yml
+++ b/roles/cephadm/tasks/pkg_debian.yml
@@ -12,3 +12,9 @@
filename: ceph
become: True
when: not cephadm_use_package_from_distribution | bool
+
+- name: Install cephadm
+ apt:
+ name: cephadm
+ install_recommends: False
+ become: True
diff --git a/roles/cephadm/tasks/pkg_redhat.yml b/roles/cephadm/tasks/pkg_redhat.yml
index 354cd5e5f..85708cef4 100644
--- a/roles/cephadm/tasks/pkg_redhat.yml
+++ b/roles/cephadm/tasks/pkg_redhat.yml
@@ -21,3 +21,9 @@
loop: "{{ cephadm_ceph_rpm_repos }}"
become: True
when: not cephadm_use_package_from_distribution
+
+- name: Install cephadm
+ dnf:
+ name: "cephadm"
+ install_weak_deps: False
+ become: True