From 0b3b05a0903b730e82ccad4d3bf18b83e6d5e600 Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Thu, 30 Nov 2023 01:50:47 +0800
Subject: [PATCH] fix: use ln -s for aio

---
 molecule/aio/molecule.yml  | 66 +-------------------------------------
 molecule/ceph/converge.yml |  2 ++
 molecule/ceph/molecule.yml | 65 +++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 65 deletions(-)
 mode change 100644 => 120000 molecule/aio/molecule.yml
 create mode 100644 molecule/ceph/molecule.yml

diff --git a/molecule/aio/molecule.yml b/molecule/aio/molecule.yml
deleted file mode 100644
index e299dfa2..00000000
--- a/molecule/aio/molecule.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (c) 2023 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
-
-dependency:
-  name: galaxy
-driver:
-  name: docker
-platforms:
-  - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    privileged: true
-    cgroupns_mode: host
-    pre_build_image: true
-    environment:
-      container: docker
-    security_opts:
-      - apparmor=unconfined
-    volumes:
-      - /dev:/dev
-      - /lib/modules:/lib/modules:ro
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-      - /usr/src:/usr/src:ro
-    groups:
-      - controllers
-      - cephs
-provisioner:
-  name: ansible
-  config_options:
-    connection:
-      pipelining: true
-  inventory:
-    group_vars:
-      all:
-        ceph_fsid: ${MOLECULE_CEPH_FSID:-"1dff0e0f-3c44-48da-81cd-4f3c6e8722b2"}
-        ceph_version: ${MOLECULE_CEPH_VERSION:-"16.2.9"}
-        ceph_conf_overrides:
-          - section: global
-            option: osd crush chooseleaf type
-            value: 0
-          - section: mon
-            option: auth allow insecure global id reclaim
-            value: false
-          - section: mon
-            option: mon data avail warn
-            value: 10
-      controllers:
-      cephs:
-        ceph_osd_devices:
-          - "/dev/ceph-{{ inventory_hostname_short }}-osd0/data"
-          - "/dev/ceph-{{ inventory_hostname_short }}-osd1/data"
-          - "/dev/ceph-{{ inventory_hostname_short }}-osd2/data"
-verifier:
-  name: ansible
diff --git a/molecule/aio/molecule.yml b/molecule/aio/molecule.yml
new file mode 120000
index 00000000..d837b42a
--- /dev/null
+++ b/molecule/aio/molecule.yml
@@ -0,0 +1 @@
+molecule/ceph/molecule.yml
\ No newline at end of file
diff --git a/molecule/ceph/converge.yml b/molecule/ceph/converge.yml
index 39aadb71..5b73bc1e 100644
--- a/molecule/ceph/converge.yml
+++ b/molecule/ceph/converge.yml
@@ -13,3 +13,5 @@
 # under the License.
 
 - ansible.builtin.import_playbook: vexxhost.ceph.site
+  vars:
+    ceph_public_network: 172.17.0.0/24
diff --git a/molecule/ceph/molecule.yml b/molecule/ceph/molecule.yml
new file mode 100644
index 00000000..e299dfa2
--- /dev/null
+++ b/molecule/ceph/molecule.yml
@@ -0,0 +1,65 @@
+# Copyright (c) 2023 VEXXHOST, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, 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.
+
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    privileged: true
+    cgroupns_mode: host
+    pre_build_image: true
+    environment:
+      container: docker
+    security_opts:
+      - apparmor=unconfined
+    volumes:
+      - /dev:/dev
+      - /lib/modules:/lib/modules:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+      - /usr/src:/usr/src:ro
+    groups:
+      - controllers
+      - cephs
+provisioner:
+  name: ansible
+  config_options:
+    connection:
+      pipelining: true
+  inventory:
+    group_vars:
+      all:
+        ceph_fsid: ${MOLECULE_CEPH_FSID:-"1dff0e0f-3c44-48da-81cd-4f3c6e8722b2"}
+        ceph_version: ${MOLECULE_CEPH_VERSION:-"16.2.9"}
+        ceph_conf_overrides:
+          - section: global
+            option: osd crush chooseleaf type
+            value: 0
+          - section: mon
+            option: auth allow insecure global id reclaim
+            value: false
+          - section: mon
+            option: mon data avail warn
+            value: 10
+      controllers:
+      cephs:
+        ceph_osd_devices:
+          - "/dev/ceph-{{ inventory_hostname_short }}-osd0/data"
+          - "/dev/ceph-{{ inventory_hostname_short }}-osd1/data"
+          - "/dev/ceph-{{ inventory_hostname_short }}-osd2/data"
+verifier:
+  name: ansible