Skip to content

Commit 11c1748

Browse files
author
Ubuntu
committed
wip
1 parent a906c2e commit 11c1748

25 files changed

+170
-155
lines changed

etc/kayobe/ansible/build-ofed-rocky.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242

4343
- name: Add DOCA host repository package
4444
ansible.builtin.dnf:
45-
name: "https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_\
46-
{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version }}.x86_64.rpm"
45+
name: https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version
46+
}}.x86_64.rpm
4747
disable_gpg_check: true
4848

4949
- name: Install DOCA extra packages

etc/kayobe/ansible/cephadm-commands-post.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
- cephadm
88
- cephadm-commands
99
tasks:
10-
- import_role:
10+
- name: Apply Cephadm role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.commands
1213
vars:
1314
cephadm_commands: "{{ cephadm_commands_post | default([]) }}"

etc/kayobe/ansible/cephadm-commands-pre.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
- cephadm
88
- cephadm-commands
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.commands
1213
vars:
1314
cephadm_commands: "{{ cephadm_commands_pre | default([]) }}"

etc/kayobe/ansible/cephadm-crush-rules.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-crush-rules
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm crush rule role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.crush_rules

etc/kayobe/ansible/cephadm-deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-deploy
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.cephadm

etc/kayobe/ansible/cephadm-ec-profiles.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-ec-profiles
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm EC profiles role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.ec_profiles

etc/kayobe/ansible/cephadm-gather-keys.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
loop: "{{ kolla_ceph_services | selectattr('required') | map(attribute='keys') | flatten | unique }}"
3333

3434
- name: Generate ceph.conf
35-
command: cephadm shell -- ceph config generate-minimal-conf
35+
ansible.builtin.command: cephadm shell -- ceph config generate-minimal-conf
3636
become: true
3737
register: cephadm_ceph_conf
3838
changed_when: false
3939

4040
- name: Ensure Kolla config directories are present
41-
file:
41+
ansible.builtin.file:
4242
state: directory
4343
path: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_key_dir[item.name] }}"
4444
loop: "{{ kolla_ceph_services | selectattr('required') }}"
@@ -51,7 +51,7 @@
5151
key_info: "{{ cephadm_key_info.results | selectattr('item', 'equalto', item.1) | first }}"
5252
cephadm_key: "{{ key_info.stdout }}"
5353
cephadm_user: "{{ item.1 }}"
54-
copy:
54+
ansible.builtin.copy:
5555
# Include a trailing newline.
5656
content: |
5757
{{ cephadm_key }}
@@ -63,7 +63,7 @@
6363
notify: Please add and commit the Kayobe configuration
6464

6565
- name: Save ceph.conf to Kayobe configuration
66-
copy:
66+
ansible.builtin.copy:
6767
# Include a trailing newline.
6868
# Kolla Ansible's merge_configs module does not like the leading tabs in ceph.conf.
6969
content: |
@@ -77,7 +77,7 @@
7777

7878
handlers:
7979
- name: Please add and commit the Kayobe configuration
80-
debug:
80+
ansible.builtin.debug:
8181
msg: >-
8282
Please add and commit the Ceph configuration files and keys in Kayobe
8383
configuration. Remember to encrypt the keys using Ansible Vault.

etc/kayobe/ansible/cephadm-keys.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-keys
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm keys role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.keys

etc/kayobe/ansible/cephadm-pools.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
- cephadm
88
- cephadm-keys
99
tasks:
10-
- import_role:
10+
- name: Apply cephadm pools role
11+
ansible.builtin.import_role:
1112
name: stackhpc.cephadm.pools

etc/kayobe/ansible/cephadm.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
---
22
# Deploy Ceph via Cephadm. Create EC profiles, CRUSH rules, pools and keys.
3-
- import_playbook: cephadm-deploy.yml
4-
- import_playbook: cephadm-commands-pre.yml
5-
- import_playbook: cephadm-ec-profiles.yml
6-
- import_playbook: cephadm-crush-rules.yml
7-
- import_playbook: cephadm-pools.yml
8-
- import_playbook: cephadm-keys.yml
9-
- import_playbook: cephadm-commands-post.yml
3+
- name: Import Cephadm deploy playbook
4+
import_playbook: cephadm-deploy.yml
5+
- name: Import Cephadm commands pre playbook
6+
import_playbook: cephadm-commands-pre.yml
7+
- name: Import Cephadm ec profiles playbook
8+
import_playbook: cephadm-ec-profiles.yml
9+
- name: Import Cephadm crush rules playbook
10+
import_playbook: cephadm-crush-rules.yml
11+
- name: Import Cephadm pools playbook
12+
import_playbook: cephadm-pools.yml
13+
- name: Import Cephadm keys playbook
14+
import_playbook: cephadm-keys.yml
15+
- name: Import Cephadm commands post playbook
16+
import_playbook: cephadm-commands-post.yml

0 commit comments

Comments
 (0)