feat: adopt cephadm (#752)
diff --git a/molecule/aio/converge.yml b/molecule/aio/converge.yml
index 234aec8..7da0738 100644
--- a/molecule/aio/converge.yml
+++ b/molecule/aio/converge.yml
@@ -13,11 +13,7 @@
# under the License.
- name: Install Ceph
- ansible.builtin.import_playbook: vexxhost.ceph.site
- vars:
- # TODO(mnaser): Drop this once we switch to vexxhost.ceph 3.0.0
- ceph_version: 18.2.1
- ceph_repository_version: 18.2.1
+ ansible.builtin.import_playbook: vexxhost.atmosphere.ceph
- name: Install Kubernetes
ansible.builtin.import_playbook: vexxhost.atmosphere.kubernetes
diff --git a/molecule/aio/molecule.yml b/molecule/aio/molecule.yml
index e88073a..720a343 100644
--- a/molecule/aio/molecule.yml
+++ b/molecule/aio/molecule.yml
@@ -29,6 +29,8 @@
- computes
provisioner:
name: ansible
+ env:
+ DOCKER_TIMEOUT: 600
config_options:
defaults:
callbacks_enabled: ansible.posix.profile_tasks
diff --git a/molecule/aio/prepare.yml b/molecule/aio/prepare.yml
index e621e60..342e0d8 100644
--- a/molecule/aio/prepare.yml
+++ b/molecule/aio/prepare.yml
@@ -12,6 +12,19 @@
# License for the specific language governing permissions and limitations
# under the License.
+- name: Configure hostname
+ hosts: all
+ tasks:
+ - name: Configure short hostname
+ ansible.builtin.hostname:
+ name: "{{ inventory_hostname_short }}"
+
+ - name: Ensure hostname inside hosts file
+ ansible.builtin.lineinfile:
+ path: /etc/hosts
+ regexp: '^127\.0\.1\.1'
+ line: 127.0.1.1 {{ inventory_hostname }} {{ inventory_hostname_short }}
+
- name: Create fake devices for Ceph
ansible.builtin.import_playbook: vexxhost.ceph.create_fake_devices
diff --git a/molecule/shared/molecule.yml b/molecule/shared/molecule.yml
index fc4afdc..507a0b2 100644
--- a/molecule/shared/molecule.yml
+++ b/molecule/shared/molecule.yml
@@ -54,6 +54,8 @@
- computes
provisioner:
name: ansible
+ env:
+ DOCKER_TIMEOUT: 600
config_options:
connection:
pipelining: true
diff --git a/molecule/shared/prepare/ceph.yml b/molecule/shared/prepare/ceph.yml
index cd622d3..8cff449 100644
--- a/molecule/shared/prepare/ceph.yml
+++ b/molecule/shared/prepare/ceph.yml
@@ -13,7 +13,7 @@
# under the License.
- ansible.builtin.import_playbook: vexxhost.ceph.create_fake_devices
-- ansible.builtin.import_playbook: vexxhost.ceph.site
+- ansible.builtin.import_playbook: vexxhost.atmosphere.ceph
vars:
ceph_osd_devices:
- "/dev/ceph-{{ inventory_hostname_short }}-osd0/data"