From 99d320946576826cc12fa74343a4793934581215 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Tue, 22 Dec 2020 11:37:24 +0800 Subject: [PATCH 1/8] remove ceph 14.2 specific override --- roles/ceph_mds | 2 +- roles/ceph_mgr | 2 +- roles/ceph_mon | 2 +- roles/ceph_rgw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/ceph_mds b/roles/ceph_mds index 2ad4e86..6755389 160000 --- a/roles/ceph_mds +++ b/roles/ceph_mds @@ -1 +1 @@ -Subproject commit 2ad4e8672b3acae7e49cd282a6919c114ed9a645 +Subproject commit 67553890f23bf3944c0ecd6ead88070a89d4007a diff --git a/roles/ceph_mgr b/roles/ceph_mgr index 4222a9c..776f17d 160000 --- a/roles/ceph_mgr +++ b/roles/ceph_mgr @@ -1 +1 @@ -Subproject commit 4222a9c74bbb3a72dfbf82fac1deace934f09906 +Subproject commit 776f17dad395e68cc5fe7de2eee77c7ed1643ff2 diff --git a/roles/ceph_mon b/roles/ceph_mon index 44dcaf1..b3f11f7 160000 --- a/roles/ceph_mon +++ b/roles/ceph_mon @@ -1 +1 @@ -Subproject commit 44dcaf1c0d9492b20704cac86d271ee97d7bc5d5 +Subproject commit b3f11f7535765a74cea3a923618cb5fe0cadc5c9 diff --git a/roles/ceph_rgw b/roles/ceph_rgw index aaa8b01..d477bbe 160000 --- a/roles/ceph_rgw +++ b/roles/ceph_rgw @@ -1 +1 @@ -Subproject commit aaa8b012ca76926d1a0103fab459b2fdf1c0ce39 +Subproject commit d477bbe02eb3712716ff25e6f398846de8d213e4 From d5017b510ef5fc441db0b2872613e31ffa9e52e0 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Tue, 22 Dec 2020 14:01:03 +0800 Subject: [PATCH 2/8] rollback to /var/lib/ceph/radosgw/ceph-rgw.{{ inventory_hostname }} --- roles/ceph_rgw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph_rgw b/roles/ceph_rgw index d477bbe..5636839 160000 --- a/roles/ceph_rgw +++ b/roles/ceph_rgw @@ -1 +1 @@ -Subproject commit d477bbe02eb3712716ff25e6f398846de8d213e4 +Subproject commit 5636839fe062415d0ecc1f8668305ca32f8b56c2 From 611fa73927c96bcdce9b62063f0ad6e2fd92ab4c Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Tue, 22 Dec 2020 14:30:28 +0800 Subject: [PATCH 3/8] systemctl start ceph-radosgw@rgw.{{ inventory_hostname }}.service --- roles/ceph_mds | 2 +- roles/ceph_mgr | 2 +- roles/ceph_mon | 2 +- roles/ceph_rgw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/ceph_mds b/roles/ceph_mds index 6755389..51d1ea7 160000 --- a/roles/ceph_mds +++ b/roles/ceph_mds @@ -1 +1 @@ -Subproject commit 67553890f23bf3944c0ecd6ead88070a89d4007a +Subproject commit 51d1ea7ce111375aa81ca5d5ee0414531a1082e3 diff --git a/roles/ceph_mgr b/roles/ceph_mgr index 776f17d..edbdb98 160000 --- a/roles/ceph_mgr +++ b/roles/ceph_mgr @@ -1 +1 @@ -Subproject commit 776f17dad395e68cc5fe7de2eee77c7ed1643ff2 +Subproject commit edbdb98e7a534d1f00ff4d82e5bcaf645d621de5 diff --git a/roles/ceph_mon b/roles/ceph_mon index b3f11f7..aeddb54 160000 --- a/roles/ceph_mon +++ b/roles/ceph_mon @@ -1 +1 @@ -Subproject commit b3f11f7535765a74cea3a923618cb5fe0cadc5c9 +Subproject commit aeddb54f42d952b1b164ddf453d6543cd394e8ff diff --git a/roles/ceph_rgw b/roles/ceph_rgw index 5636839..b4b464a 160000 --- a/roles/ceph_rgw +++ b/roles/ceph_rgw @@ -1 +1 @@ -Subproject commit 5636839fe062415d0ecc1f8668305ca32f8b56c2 +Subproject commit b4b464ac267adb7ffa5f4acbb3b1a486c157750a From 7e8acca8600961d33e20423510477cf690cd250b Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Tue, 22 Dec 2020 14:48:49 +0800 Subject: [PATCH 4/8] shell: | --- roles/ceph_mds | 2 +- roles/ceph_mgr | 2 +- roles/ceph_mon | 2 +- roles/ceph_rgw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/ceph_mds b/roles/ceph_mds index 51d1ea7..8aaec85 160000 --- a/roles/ceph_mds +++ b/roles/ceph_mds @@ -1 +1 @@ -Subproject commit 51d1ea7ce111375aa81ca5d5ee0414531a1082e3 +Subproject commit 8aaec8566e08dc28aa13042d17513cdd13340801 diff --git a/roles/ceph_mgr b/roles/ceph_mgr index edbdb98..c4eb68d 160000 --- a/roles/ceph_mgr +++ b/roles/ceph_mgr @@ -1 +1 @@ -Subproject commit edbdb98e7a534d1f00ff4d82e5bcaf645d621de5 +Subproject commit c4eb68dfd5922fd2767aab4b7a9e0af3e3d2d8ff diff --git a/roles/ceph_mon b/roles/ceph_mon index aeddb54..470b1ac 160000 --- a/roles/ceph_mon +++ b/roles/ceph_mon @@ -1 +1 @@ -Subproject commit aeddb54f42d952b1b164ddf453d6543cd394e8ff +Subproject commit 470b1ac8192daf8ac3e89c13af44e8dcba6f866b diff --git a/roles/ceph_rgw b/roles/ceph_rgw index b4b464a..a29639e 160000 --- a/roles/ceph_rgw +++ b/roles/ceph_rgw @@ -1 +1 @@ -Subproject commit b4b464ac267adb7ffa5f4acbb3b1a486c157750a +Subproject commit a29639e526a776b9f13c16fd381f24a66d078d94 From 6f9400b5da359f25324964a93e13aaf969887fc4 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Thu, 24 Dec 2020 22:31:55 +0800 Subject: [PATCH 5/8] git submodule update --remote --- roles/locales | 2 +- roles/sshd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/locales b/roles/locales index a8413b8..e5150fa 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit a8413b8fe497f1789583386f11ce99cd46e0c9c8 +Subproject commit e5150fa850418a605de8ec4733a7208015c33881 diff --git a/roles/sshd b/roles/sshd index 2778962..488e78c 160000 --- a/roles/sshd +++ b/roles/sshd @@ -1 +1 @@ -Subproject commit 2778962735208111c0fcdccb28ab0f479ee2fa9d +Subproject commit 488e78c86ea3a4762e7fbdae3f65f08421c9868b From 371ba866582e7a665b07931d5011c6f81d500d9b Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Mon, 28 Dec 2020 18:27:15 +0800 Subject: [PATCH 6/8] simplify for vagrant-libvirt --- .../default/group_vars/all/00-defaults.yml | 20 ---------- .../centos-7/group_vars/all/99-molecule.yml | 11 ----- molecule/centos-7/molecule.yml | 16 ++------ .../centos-8/group_vars/all/99-molecule.yml | 11 ----- molecule/centos-8/molecule.yml | 16 ++------ .../debian-10/group_vars/all/99-molecule.yml | 11 ----- molecule/debian-10/molecule.yml | 16 ++------ .../fedora-33/group_vars/all/99-molecule.yml | 11 ----- molecule/fedora-33/molecule.yml | 16 ++------ .../redhat-7/group_vars/all/99-molecule.yml | 11 ----- molecule/redhat-7/molecule.yml | 16 ++------ .../redhat-8/group_vars/all/99-molecule.yml | 11 ----- molecule/redhat-8/molecule.yml | 16 ++------ .../suse-15/group_vars/all/99-molecule.yml | 11 ----- molecule/suse-15/molecule.yml | 18 +++------ .../group_vars/all/99-molecule.yml | 11 ----- molecule/ubuntu-18.04/molecule.yml | 16 ++------ .../group_vars/all/99-molecule.yml | 11 ----- molecule/ubuntu-20.04/molecule.yml | 16 ++------ .../group_vars/all/99-molecule.yml | 11 ----- molecule/ubuntu-20.10/molecule.yml | 16 ++------ playbooks/ceph-install.yml | 40 +++++++++---------- roles/ansible | 2 +- roles/bootstrap | 2 +- roles/ceph_common | 2 +- roles/ceph_mds | 2 +- roles/ceph_mgr | 2 +- roles/ceph_mon | 2 +- roles/ceph_osd | 2 +- roles/ceph_rgw | 2 +- roles/chrony | 2 +- roles/git | 2 +- roles/kernel | 2 +- roles/locales | 2 +- roles/python | 2 +- roles/rclone | 2 +- roles/restic | 2 +- roles/sshd | 2 +- roles/timezone | 2 +- roles/vim | 2 +- 40 files changed, 79 insertions(+), 289 deletions(-) diff --git a/inventory/default/group_vars/all/00-defaults.yml b/inventory/default/group_vars/all/00-defaults.yml index a1b6e9c..f3405c5 100644 --- a/inventory/default/group_vars/all/00-defaults.yml +++ b/inventory/default/group_vars/all/00-defaults.yml @@ -14,25 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -# kernel -kernel_release: "mainline" - # ceph_common ceph_release: "15.2" -ceph_fsid: "{{ hostvars[groups['ceph_mon'][0]].ansible_machine_id | to_uuid }}" -ceph_mon_initial_members: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [host] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_default_ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/centos-7/group_vars/all/99-molecule.yml b/molecule/centos-7/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/centos-7/group_vars/all/99-molecule.yml +++ b/molecule/centos-7/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/centos-7/molecule.yml b/molecule/centos-7/molecule.yml index 1a83479..6dab3fd 100644 --- a/molecule/centos-7/molecule.yml +++ b/molecule/centos-7/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/centos7 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/molecule/centos-8/group_vars/all/99-molecule.yml b/molecule/centos-8/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/centos-8/group_vars/all/99-molecule.yml +++ b/molecule/centos-8/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/centos-8/molecule.yml b/molecule/centos-8/molecule.yml index 7f46785..890226b 100644 --- a/molecule/centos-8/molecule.yml +++ b/molecule/centos-8/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/centos8 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/molecule/debian-10/group_vars/all/99-molecule.yml b/molecule/debian-10/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/debian-10/group_vars/all/99-molecule.yml +++ b/molecule/debian-10/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/debian-10/molecule.yml b/molecule/debian-10/molecule.yml index 96bdc50..751087a 100644 --- a/molecule/debian-10/molecule.yml +++ b/molecule/debian-10/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/debian10 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/molecule/fedora-33/group_vars/all/99-molecule.yml b/molecule/fedora-33/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/fedora-33/group_vars/all/99-molecule.yml +++ b/molecule/fedora-33/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/fedora-33/molecule.yml b/molecule/fedora-33/molecule.yml index 223925c..50d90cc 100644 --- a/molecule/fedora-33/molecule.yml +++ b/molecule/fedora-33/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/fedora33 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/molecule/redhat-7/group_vars/all/99-molecule.yml b/molecule/redhat-7/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/redhat-7/group_vars/all/99-molecule.yml +++ b/molecule/redhat-7/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/redhat-7/molecule.yml b/molecule/redhat-7/molecule.yml index 6e25e44..2eadb99 100644 --- a/molecule/redhat-7/molecule.yml +++ b/molecule/redhat-7/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/rhel7 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/molecule/redhat-8/group_vars/all/99-molecule.yml b/molecule/redhat-8/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/redhat-8/group_vars/all/99-molecule.yml +++ b/molecule/redhat-8/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/redhat-8/molecule.yml b/molecule/redhat-8/molecule.yml index 00029d9..4dfc3f3 100644 --- a/molecule/redhat-8/molecule.yml +++ b/molecule/redhat-8/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/rhel8 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/molecule/suse-15/group_vars/all/99-molecule.yml b/molecule/suse-15/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/suse-15/group_vars/all/99-molecule.yml +++ b/molecule/suse-15/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/suse-15/molecule.yml b/molecule/suse-15/molecule.yml index f2d01dc..a675c3b 100644 --- a/molecule/suse-15/molecule.yml +++ b/molecule/suse-15/molecule.yml @@ -23,20 +23,12 @@ platforms: box: generic/opensuse15 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'sata'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: - - "storage :file, bus: 'sata', cache: 'writeback'" + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" + - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible - ceph_mon diff --git a/molecule/ubuntu-18.04/group_vars/all/99-molecule.yml b/molecule/ubuntu-18.04/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/ubuntu-18.04/group_vars/all/99-molecule.yml +++ b/molecule/ubuntu-18.04/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/ubuntu-18.04/molecule.yml b/molecule/ubuntu-18.04/molecule.yml index 8b3e8b2..3217126 100644 --- a/molecule/ubuntu-18.04/molecule.yml +++ b/molecule/ubuntu-18.04/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/ubuntu1804 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/molecule/ubuntu-20.04/group_vars/all/99-molecule.yml b/molecule/ubuntu-20.04/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/ubuntu-20.04/group_vars/all/99-molecule.yml +++ b/molecule/ubuntu-20.04/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/ubuntu-20.04/molecule.yml b/molecule/ubuntu-20.04/molecule.yml index 3c2eede..5520fd2 100644 --- a/molecule/ubuntu-20.04/molecule.yml +++ b/molecule/ubuntu-20.04/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/ubuntu2004 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/molecule/ubuntu-20.10/group_vars/all/99-molecule.yml b/molecule/ubuntu-20.10/group_vars/all/99-molecule.yml index 5996678..858af07 100644 --- a/molecule/ubuntu-20.10/group_vars/all/99-molecule.yml +++ b/molecule/ubuntu-20.10/group_vars/all/99-molecule.yml @@ -13,14 +13,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# ceph_common -ceph_mon_host: >- - {%- set _ns = namespace() -%} - {%- set _ns._params = [] -%} - {%- for host in groups['ceph_mon'] -%} - {%- set _ns._params = _ns._params + [hostvars[host].ansible_eth1.ipv4.address] -%} - {%- endfor -%} - {{ _ns._params | join(',') }} -ceph_public_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" -ceph_cluster_network: "{{ (ansible_eth1.ipv4.network + '/' + ansible_eth1.ipv4.netmask) | ipaddr('net') }}" diff --git a/molecule/ubuntu-20.10/molecule.yml b/molecule/ubuntu-20.10/molecule.yml index 60a9019..d4982e3 100644 --- a/molecule/ubuntu-20.10/molecule.yml +++ b/molecule/ubuntu-20.10/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/ubuntu2010 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" groups: - ansible diff --git a/playbooks/ceph-install.yml b/playbooks/ceph-install.yml index 7019bd1..d45bff1 100644 --- a/playbooks/ceph-install.yml +++ b/playbooks/ceph-install.yml @@ -37,9 +37,9 @@ - name: base64 encode shell: | set -euo pipefail - tar zcfP - {{ item.value | join(' ') }} | base64 -w 0 - with_dict: - base64: + tar zcfP - {{ _params | join(' ') }} | base64 -w 0 + vars: + _params: - "/etc/ceph/ceph.client.admin.keyring" - "/var/lib/ceph/bootstrap-mgr/ceph.keyring" args: @@ -52,7 +52,7 @@ - name: base64 decode shell: | set -euo pipefail - echo -n {{ base64_encode_result.results[0].stdout | quote }} | base64 -d | tar zx -C / + echo -n {{ base64_encode_result.stdout | quote }} | base64 -d | tar zx -C / args: executable: "/bin/bash" register: base64_decode_result @@ -70,9 +70,9 @@ - name: base64 encode shell: | set -euo pipefail - tar zcfP - {{ item.value | join(' ') }} | base64 -w 0 - with_dict: - base64: + tar zcfP - {{ _params | join(' ') }} | base64 -w 0 + vars: + _params: - "/etc/ceph/ceph.client.admin.keyring" - "/var/lib/ceph/bootstrap-osd/ceph.keyring" args: @@ -85,7 +85,7 @@ - name: base64 decode shell: | set -euo pipefail - echo -n {{ base64_encode_result.results[0].stdout | quote }} | base64 -d | tar zx -C / + echo -n {{ base64_encode_result.stdout | quote }} | base64 -d | tar zx -C / args: executable: "/bin/bash" register: base64_decode_result @@ -103,9 +103,9 @@ - name: base64 encode shell: | set -euo pipefail - tar zcfP - {{ item.value | join(' ') }} | base64 -w 0 - with_dict: - base64: + tar zcfP - {{ _params | join(' ') }} | base64 -w 0 + vars: + _params: - "/etc/ceph/ceph.client.admin.keyring" - "/var/lib/ceph/bootstrap-mds/ceph.keyring" args: @@ -118,7 +118,7 @@ - name: base64 decode shell: | set -euo pipefail - echo -n {{ base64_encode_result.results[0].stdout | quote }} | base64 -d | tar zx -C / + echo -n {{ base64_encode_result.stdout | quote }} | base64 -d | tar zx -C / args: executable: "/bin/bash" register: base64_decode_result @@ -136,9 +136,9 @@ - name: base64 encode shell: | set -euo pipefail - tar zcfP - {{ item.value | join(' ') }} | base64 -w 0 - with_dict: - base64: + tar zcfP - {{ _params | join(' ') }} | base64 -w 0 + vars: + _params: - "/etc/ceph/ceph.client.admin.keyring" - "/var/lib/ceph/bootstrap-rgw/ceph.keyring" args: @@ -151,7 +151,7 @@ - name: base64 decode shell: | set -euo pipefail - echo -n {{ base64_encode_result.results[0].stdout | quote }} | base64 -d | tar zx -C / + echo -n {{ base64_encode_result.stdout | quote }} | base64 -d | tar zx -C / args: executable: "/bin/bash" register: base64_decode_result @@ -173,9 +173,9 @@ - name: base64 encode shell: | set -euo pipefail - tar zcfP - {{ item.value | join(' ') }} | base64 -w 0 - with_dict: - base64: + tar zcfP - {{ _params | join(' ') }} | base64 -w 0 + vars: + _params: - "/etc/ceph/ceph.client.admin.keyring" args: executable: "/bin/bash" @@ -187,7 +187,7 @@ - name: base64 decode shell: | set -euo pipefail - echo -n {{ base64_encode_result.results[0].stdout | quote }} | base64 -d | tar zx -C / + echo -n {{ base64_encode_result.stdout | quote }} | base64 -d | tar zx -C / args: executable: "/bin/bash" register: base64_decode_result diff --git a/roles/ansible b/roles/ansible index 6bb6e4f..94d63d9 160000 --- a/roles/ansible +++ b/roles/ansible @@ -1 +1 @@ -Subproject commit 6bb6e4f2c0ca75700ae5325c8c1bb3983008ac3e +Subproject commit 94d63d92692694edfaa6a52a78204e170a42e469 diff --git a/roles/bootstrap b/roles/bootstrap index 3da3d6c..d707013 160000 --- a/roles/bootstrap +++ b/roles/bootstrap @@ -1 +1 @@ -Subproject commit 3da3d6c3a370d90488b149a67452d2e5d46b03a1 +Subproject commit d707013666721be43840b7ca16caacdf17e489ee diff --git a/roles/ceph_common b/roles/ceph_common index 6d410b3..3754186 160000 --- a/roles/ceph_common +++ b/roles/ceph_common @@ -1 +1 @@ -Subproject commit 6d410b38555df6cc2cbf8b078a68433f9aec71dd +Subproject commit 3754186ba3c54c5e5388c75dbe6433f9b2735b1d diff --git a/roles/ceph_mds b/roles/ceph_mds index 8aaec85..d61d0cd 160000 --- a/roles/ceph_mds +++ b/roles/ceph_mds @@ -1 +1 @@ -Subproject commit 8aaec8566e08dc28aa13042d17513cdd13340801 +Subproject commit d61d0cd64c80478caed609e7402b8724c3c67d12 diff --git a/roles/ceph_mgr b/roles/ceph_mgr index c4eb68d..56e09f0 160000 --- a/roles/ceph_mgr +++ b/roles/ceph_mgr @@ -1 +1 @@ -Subproject commit c4eb68dfd5922fd2767aab4b7a9e0af3e3d2d8ff +Subproject commit 56e09f0a8fd477c1c4d224b944e29e148a65609c diff --git a/roles/ceph_mon b/roles/ceph_mon index 470b1ac..762b156 160000 --- a/roles/ceph_mon +++ b/roles/ceph_mon @@ -1 +1 @@ -Subproject commit 470b1ac8192daf8ac3e89c13af44e8dcba6f866b +Subproject commit 762b156c8267336cae774965a75b6a19d263299e diff --git a/roles/ceph_osd b/roles/ceph_osd index 1905639..cd4b875 160000 --- a/roles/ceph_osd +++ b/roles/ceph_osd @@ -1 +1 @@ -Subproject commit 19056393d1c9f64297c5e44f061386c8cba4ce24 +Subproject commit cd4b875b3add2646a3d400b0a7d4e86156936fb1 diff --git a/roles/ceph_rgw b/roles/ceph_rgw index a29639e..827fd4d 160000 --- a/roles/ceph_rgw +++ b/roles/ceph_rgw @@ -1 +1 @@ -Subproject commit a29639e526a776b9f13c16fd381f24a66d078d94 +Subproject commit 827fd4d79cc5f667e05d12aaea10641631797c30 diff --git a/roles/chrony b/roles/chrony index 7c9d5e8..5234cfa 160000 --- a/roles/chrony +++ b/roles/chrony @@ -1 +1 @@ -Subproject commit 7c9d5e857da5f18a3396ea3754486433f17567d2 +Subproject commit 5234cfad17b786d7f668dcd6f833477469b8693a diff --git a/roles/git b/roles/git index b7cd12d..787dcf3 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit b7cd12dc212760c36d83481e095ef49656dd6fd0 +Subproject commit 787dcf3195ff4ef26e97d0afee68b39f328b26c1 diff --git a/roles/kernel b/roles/kernel index 8686d79..34a5f3b 160000 --- a/roles/kernel +++ b/roles/kernel @@ -1 +1 @@ -Subproject commit 8686d790cb0c6524dd47df877e7fcc5cecbf784f +Subproject commit 34a5f3b09904026e3c6be39a458643727f6fafb6 diff --git a/roles/locales b/roles/locales index e5150fa..965493c 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit e5150fa850418a605de8ec4733a7208015c33881 +Subproject commit 965493c5b59d9f5d71b13a7d6c58f5a3d56df08c diff --git a/roles/python b/roles/python index 52b986d..17fa8e5 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit 52b986df25b6584244ddd92d5fb3aceb55e3943b +Subproject commit 17fa8e5f86bdcc2e83e5e9f4ac1b4119b8773d92 diff --git a/roles/rclone b/roles/rclone index 8705003..44754a4 160000 --- a/roles/rclone +++ b/roles/rclone @@ -1 +1 @@ -Subproject commit 870500323d85683011a425fed408939dd3b39734 +Subproject commit 44754a4105ff7cb65fea7f444eb5f7d47fb9685b diff --git a/roles/restic b/roles/restic index 0b6f88e..a80e7ca 160000 --- a/roles/restic +++ b/roles/restic @@ -1 +1 @@ -Subproject commit 0b6f88ec2a6bb0cda3733090c9333daf257cb856 +Subproject commit a80e7ca56182b34da5790c208136179710097126 diff --git a/roles/sshd b/roles/sshd index 488e78c..d92ac36 160000 --- a/roles/sshd +++ b/roles/sshd @@ -1 +1 @@ -Subproject commit 488e78c86ea3a4762e7fbdae3f65f08421c9868b +Subproject commit d92ac36a1b513417677eb54e6bec30e78dc46fa8 diff --git a/roles/timezone b/roles/timezone index d3d3419..43b1bec 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit d3d3419f0cf489d58cc4364be5dc4ac0acaf0a85 +Subproject commit 43b1bec0668aea8bf271d664b8f3a119951bb459 diff --git a/roles/vim b/roles/vim index d7a4eaf..b81ca3a 160000 --- a/roles/vim +++ b/roles/vim @@ -1 +1 @@ -Subproject commit d7a4eaf8258dcd3f532635fc745edfaa42952a13 +Subproject commit b81ca3a2d8227ab045daea883afe2e308afbf320 From 8333ef375414eee298e623797d66e25839881295 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Mon, 28 Dec 2020 22:16:29 +0800 Subject: [PATCH 7/8] Remove Ceph 14.2 Nautilus support --- CHANGELOG.md | 2 ++ roles/ceph_common | 2 +- roles/ceph_mds | 2 +- roles/ceph_mgr | 2 +- roles/ceph_mon | 2 +- roles/ceph_osd | 2 +- roles/ceph_rgw | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eeb70cc..94c15cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### Major Changes + - Remove Ceph 14.2 Nautilus support + - Simplify Molecule scenario for vagrant-libvirt - Migrate from Travis CI to GitLab CI - Support Fedora 33 - Remove Fedora 32 support diff --git a/roles/ceph_common b/roles/ceph_common index 3754186..35a4b59 160000 --- a/roles/ceph_common +++ b/roles/ceph_common @@ -1 +1 @@ -Subproject commit 3754186ba3c54c5e5388c75dbe6433f9b2735b1d +Subproject commit 35a4b596390c1918880e6967d31daf4e69c8c853 diff --git a/roles/ceph_mds b/roles/ceph_mds index d61d0cd..ceecd06 160000 --- a/roles/ceph_mds +++ b/roles/ceph_mds @@ -1 +1 @@ -Subproject commit d61d0cd64c80478caed609e7402b8724c3c67d12 +Subproject commit ceecd060b131635df0e065b9b25f30e32c5b4815 diff --git a/roles/ceph_mgr b/roles/ceph_mgr index 56e09f0..7337de6 160000 --- a/roles/ceph_mgr +++ b/roles/ceph_mgr @@ -1 +1 @@ -Subproject commit 56e09f0a8fd477c1c4d224b944e29e148a65609c +Subproject commit 7337de6c724aae5d90ea1b1d07fc3e0e3da0ba2f diff --git a/roles/ceph_mon b/roles/ceph_mon index 762b156..413ddd4 160000 --- a/roles/ceph_mon +++ b/roles/ceph_mon @@ -1 +1 @@ -Subproject commit 762b156c8267336cae774965a75b6a19d263299e +Subproject commit 413ddd4c11a1dbc31d5504d8eadce21ba3cb7968 diff --git a/roles/ceph_osd b/roles/ceph_osd index cd4b875..186df76 160000 --- a/roles/ceph_osd +++ b/roles/ceph_osd @@ -1 +1 @@ -Subproject commit cd4b875b3add2646a3d400b0a7d4e86156936fb1 +Subproject commit 186df762982b41745dd61bde07cf0c67e3c7923e diff --git a/roles/ceph_rgw b/roles/ceph_rgw index 827fd4d..a6019d1 160000 --- a/roles/ceph_rgw +++ b/roles/ceph_rgw @@ -1 +1 @@ -Subproject commit 827fd4d79cc5f667e05d12aaea10641631797c30 +Subproject commit a6019d1459f3d11c29c343372df4dfebc9021587 From e467c45911cbb5b0e8dafab90715761fbb9e6f9f Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Mon, 28 Dec 2020 22:55:42 +0800 Subject: [PATCH 8/8] 4.6.0 --- CHANGELOG.md | 6 +++++- roles/ansible | 2 +- roles/bootstrap | 2 +- roles/ceph_common | 2 +- roles/ceph_mds | 2 +- roles/ceph_mgr | 2 +- roles/ceph_mon | 2 +- roles/ceph_osd | 2 +- roles/ceph_rgw | 2 +- roles/chrony | 2 +- roles/git | 2 +- roles/kernel | 2 +- roles/locales | 2 +- roles/python | 2 +- roles/rclone | 2 +- roles/restic | 2 +- roles/sshd | 2 +- roles/timezone | 2 +- roles/vim | 2 +- 19 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c15cf..4b66a22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Ansible Collection for Ceph -## 4.6.0 - TBC +## 4.7.0 - TBC + +### Major Changes + +## 4.6.0 - 2020-12-28 ### Major Changes diff --git a/roles/ansible b/roles/ansible index 94d63d9..7a02cf2 160000 --- a/roles/ansible +++ b/roles/ansible @@ -1 +1 @@ -Subproject commit 94d63d92692694edfaa6a52a78204e170a42e469 +Subproject commit 7a02cf218365090e1484c96de42dd4e5549e5082 diff --git a/roles/bootstrap b/roles/bootstrap index d707013..f475184 160000 --- a/roles/bootstrap +++ b/roles/bootstrap @@ -1 +1 @@ -Subproject commit d707013666721be43840b7ca16caacdf17e489ee +Subproject commit f475184db1cf8ce2e056f19b202dc38ae58e3a6e diff --git a/roles/ceph_common b/roles/ceph_common index 35a4b59..dd956dc 160000 --- a/roles/ceph_common +++ b/roles/ceph_common @@ -1 +1 @@ -Subproject commit 35a4b596390c1918880e6967d31daf4e69c8c853 +Subproject commit dd956dc4d5eae80391ba3d623a00089b30505001 diff --git a/roles/ceph_mds b/roles/ceph_mds index ceecd06..db1dc90 160000 --- a/roles/ceph_mds +++ b/roles/ceph_mds @@ -1 +1 @@ -Subproject commit ceecd060b131635df0e065b9b25f30e32c5b4815 +Subproject commit db1dc90b4f92f697e7284614aba1eac95dc08256 diff --git a/roles/ceph_mgr b/roles/ceph_mgr index 7337de6..2016441 160000 --- a/roles/ceph_mgr +++ b/roles/ceph_mgr @@ -1 +1 @@ -Subproject commit 7337de6c724aae5d90ea1b1d07fc3e0e3da0ba2f +Subproject commit 20164419960acd1b2fb3351852bfd1042d82d1f2 diff --git a/roles/ceph_mon b/roles/ceph_mon index 413ddd4..76bf7d0 160000 --- a/roles/ceph_mon +++ b/roles/ceph_mon @@ -1 +1 @@ -Subproject commit 413ddd4c11a1dbc31d5504d8eadce21ba3cb7968 +Subproject commit 76bf7d00fc19427b3035a45749f2f0f1c5719521 diff --git a/roles/ceph_osd b/roles/ceph_osd index 186df76..875298f 160000 --- a/roles/ceph_osd +++ b/roles/ceph_osd @@ -1 +1 @@ -Subproject commit 186df762982b41745dd61bde07cf0c67e3c7923e +Subproject commit 875298f5adaf47968b8b69fc1d98587de4e7b0e3 diff --git a/roles/ceph_rgw b/roles/ceph_rgw index a6019d1..32dd5c5 160000 --- a/roles/ceph_rgw +++ b/roles/ceph_rgw @@ -1 +1 @@ -Subproject commit a6019d1459f3d11c29c343372df4dfebc9021587 +Subproject commit 32dd5c588b319cdec057624356a62f8249a06d72 diff --git a/roles/chrony b/roles/chrony index 5234cfa..6cbc348 160000 --- a/roles/chrony +++ b/roles/chrony @@ -1 +1 @@ -Subproject commit 5234cfad17b786d7f668dcd6f833477469b8693a +Subproject commit 6cbc3481529030542f0d0a49310f663378315c73 diff --git a/roles/git b/roles/git index 787dcf3..913ed31 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit 787dcf3195ff4ef26e97d0afee68b39f328b26c1 +Subproject commit 913ed31812689c2bc4a05e7843145e9c82496c26 diff --git a/roles/kernel b/roles/kernel index 34a5f3b..9a32b89 160000 --- a/roles/kernel +++ b/roles/kernel @@ -1 +1 @@ -Subproject commit 34a5f3b09904026e3c6be39a458643727f6fafb6 +Subproject commit 9a32b897ce36ce98ab6af07a8aebe565f9e7961c diff --git a/roles/locales b/roles/locales index 965493c..dd04095 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit 965493c5b59d9f5d71b13a7d6c58f5a3d56df08c +Subproject commit dd0409597cf9b16a377cb761b98cd884d7318f77 diff --git a/roles/python b/roles/python index 17fa8e5..1239636 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit 17fa8e5f86bdcc2e83e5e9f4ac1b4119b8773d92 +Subproject commit 1239636eb66df5f606eb8cdf1703e9fbecf1c59a diff --git a/roles/rclone b/roles/rclone index 44754a4..8e3c5f8 160000 --- a/roles/rclone +++ b/roles/rclone @@ -1 +1 @@ -Subproject commit 44754a4105ff7cb65fea7f444eb5f7d47fb9685b +Subproject commit 8e3c5f832aa9b46752cc2517ee53eb94be121df6 diff --git a/roles/restic b/roles/restic index a80e7ca..49ae9f3 160000 --- a/roles/restic +++ b/roles/restic @@ -1 +1 @@ -Subproject commit a80e7ca56182b34da5790c208136179710097126 +Subproject commit 49ae9f3399efb609cd0e7bd9c358d2c6d7908911 diff --git a/roles/sshd b/roles/sshd index d92ac36..be898be 160000 --- a/roles/sshd +++ b/roles/sshd @@ -1 +1 @@ -Subproject commit d92ac36a1b513417677eb54e6bec30e78dc46fa8 +Subproject commit be898be461d480108bbbba44ecdcf903c22a660b diff --git a/roles/timezone b/roles/timezone index 43b1bec..a8cee08 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit 43b1bec0668aea8bf271d664b8f3a119951bb459 +Subproject commit a8cee08d7fd7da14d4301fc5d771627779bd9306 diff --git a/roles/vim b/roles/vim index b81ca3a..0edbbe7 160000 --- a/roles/vim +++ b/roles/vim @@ -1 +1 @@ -Subproject commit b81ca3a2d8227ab045daea883afe2e308afbf320 +Subproject commit 0edbbe702d03240903b7f0fd6152097f270dd594