Skip to content

Commit 5cfe142

Browse files
committed
Merge branch 'release/4.1.5'
2 parents c046a48 + 9342c61 commit 5cfe142

File tree

10 files changed

+18
-5
lines changed

10 files changed

+18
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Add `operator-sdk`
88
- Replace `duplicity` with `restic`
9+
- Default with `mainline` kernel
910

1011
## 4.1.0 - 2020-01-15
1112

inventory/aio/group_vars/all/all.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
---
22

3+
# kernel
4+
kernel_release: "mainline"
5+
36
# ceph-common
47
ceph_fsid: "{{ hostvars[groups['ceph-mon'][0]].ansible_machine_id | to_uuid }}"
58
ceph_mon_initial_members: >-

inventory/lxd/group_vars/all/all.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
---
22

3+
# kernel
4+
kernel_release: "mainline"
5+
36
# ceph-common
47
ceph_fsid: "{{ hostvars[groups['ceph-mon'][0]].ansible_machine_id | to_uuid }}"
58
ceph_mon_initial_members: >-

inventory/sample/group_vars/all/all.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
---
22

3+
# kernel
4+
kernel_release: "mainline"
5+
36
# ceph-common
47
ceph_fsid: "{{ hostvars[groups['ceph-mon'][0]].ansible_machine_id | to_uuid }}"
58
ceph_mon_initial_members: >-

inventory/vagrant/group_vars/all/all.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
---
22

3+
# kernel
4+
kernel_release: "mainline"
5+
36
# ceph-common
47
ceph_fsid: "{{ hostvars[groups['ceph-mon'][0]].ansible_machine_id | to_uuid }}"
58
ceph_mon_initial_members: >-

0 commit comments

Comments
 (0)