Merge branch 'release/4.6.0'

alvistack · Dec 28, 2020 · 87c0d0e · 87c0d0e
2 parents fae418a + e467c45
commit 87c0d0e
Show file tree

Hide file tree

Showing 41 changed files with 86 additions and 290 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Ansible Collection for Ceph
 
-## 4.6.0 - TBC
+## 4.7.0 - TBC
 
 ### Major Changes
 
+## 4.6.0 - 2020-12-28
+
+### 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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