Skip to content

Commit 4190776

Browse files
committed
Change defaults, add precheck for bootstrap
1 parent df8a18b commit 4190776

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

defaults/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
---
2-
cephadm_skip_prechecks: false
2+
cephadm_skip_prechecks: False
33
# FSID
4-
cephadm_fsid: "4aaf9419-b281-4672-9f6d-2f549ac7c774"
4+
cephadm_fsid: ""
55
# Recreate cluster
6-
cephadm_recreate: false
6+
cephadm_recreate: False
77
# Packages
8-
cephadm_custom_repos: true
8+
cephadm_custom_repos: False
99
# Registry
1010
cephadm_registry_url: ""
1111
cephadm_registry_username: ""
1212
cephadm_registry_password: ""
1313
# Bootstrap settings
14-
cephadm_enable_dashboard: false
15-
cephadm_enable_firewalld: false
16-
cephadm_enable_monitoring: false
17-
cephadm_install_ceph_cli: false
14+
cephadm_enable_dashboard: False
15+
cephadm_enable_firewalld: False
16+
cephadm_enable_monitoring: False
17+
cephadm_install_ceph_cli: False
1818
cephadm_ssh_public_key: "/etc/ceph/cephadm.pub"
1919
cephadm_ssh_private_key: "/etc/ceph/cephadm.id"
2020
# Networking
21-
cephadm_public_interface: "{{ storage_net_interface }}"
22-
cephadm_cluster_interface: "{{ storage_mgmt_net_interface }}"
23-
cephadm_public_network: "{{ storage_net_cidr }}"
24-
cephadm_cluster_network: "{{ storage_mgmt_net_cidr }}"
21+
cephadm_public_interface: ""
22+
cephadm_cluster_interface: ""
23+
cephadm_public_network: ""
24+
cephadm_cluster_network: ""
2525
# OSDs
2626
cephadm_osd_devices: []
2727
cephadm_osd_spec: []

tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

55
- include_tasks: "prechecks.yml"
66
when: not cephadm_skip_prechecks | bool
7+
78
- include_tasks: "prereqs.yml"
9+
810
- include_tasks: "bootstrap.yml"
911
when: cephadm_bootstrap | bool
12+
1013
- include_tasks: "osds.yml"

tasks/prechecks.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
- name: Populate service facts
3+
service_facts:
4+
5+
- name: Set cephadm_bootstrap
6+
set_fact:
7+
cephadm_bootstrap: True
8+
when: ansible_facts.services['ceph.target'] is defined

0 commit comments

Comments
 (0)