Simplify Ansible inventory
In order to make things more straightforward, we switch only to 3
groups:
- controllers
- cephs
- computes
We can introduce more flexiblity in the future, but this is good
enough for now.
Sem-Ver: feature
Change-Id: I450ce3f79db3eec3f5e062d3cbd4a8764081b268
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 351718b..ac0b158 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -20,9 +20,6 @@
- name: ctl1
groups: &controller_groups
- controllers
- - cephs
- - ceph_mons
- - ceph_mgrs
- name: ctl2
groups: *controller_groups
- name: ctl3
@@ -30,7 +27,6 @@
- name: nvme1
groups: &nvme_groups
- cephs
- - ceph_osds
- name: nvme2
groups: *nvme_groups
- name: nvme3
@@ -51,11 +47,10 @@
group_vars:
all:
atmosphere_image_repository: us-docker.pkg.dev/vexxhost-infra/openstack
+ ceph_mon_fsid: 441193d8-fed9-485b-87f4-09245ddc1fe7
+ ceph_mon_public_network: 10.96.240.0/24
kubernetes_hostname: 10.96.240.10
- controllers:
- kubernetes_keepalived_vrid: 42
- kubernetes_keepalived_interface: ens3
- kubernetes_keepalived_vip: 10.96.240.10
+ # OpenStack
openstack_helm_endpoints_region_name: RegionOne
# Keystone
openstack_helm_endpoints_keystone_api_host: "identity.{{ hostvars['ctl1']['ansible_host'].replace('.', '-') }}.nip.io"
@@ -87,10 +82,11 @@
openstack_helm_endpoints_heat_cfn_api_host: "cloudformation.{{ hostvars['ctl1']['ansible_host'].replace('.', '-') }}.nip.io"
# Horizon
openstack_helm_endpoints_horizon_api_host: "dashboard.{{ hostvars['ctl1']['ansible_host'].replace('.', '-') }}.nip.io"
+ controllers:
+ kubernetes_keepalived_vrid: 42
+ kubernetes_keepalived_interface: ens3
+ kubernetes_keepalived_vip: 10.96.240.10
cephs:
- ceph_mon_fsid: 441193d8-fed9-485b-87f4-09245ddc1fe7
- ceph_mon_public_network: 10.96.240.0/24
- ceph_osds:
ceph_osd_devices:
- /dev/vdb
- /dev/vdc
diff --git a/playbooks/ceph.yml b/playbooks/ceph.yml
index 8bc3a33..58ba618 100644
--- a/playbooks/ceph.yml
+++ b/playbooks/ceph.yml
@@ -13,25 +13,20 @@
# under the License.
- name: Setup Ceph repository
- hosts: cephs
+ hosts: controllers:cephs
become: true
roles:
- ceph_repository
-- name: Deploy Ceph monitors
- hosts: ceph_mons
+- name: Deploy Ceph monitors & managers
+ hosts: controllers
become: true
roles:
- ceph_mon
-
-- name: Deploy Ceph managers
- hosts: ceph_mgrs
- become: true
- roles:
- ceph_mgr
- name: Deploy Ceph OSDs
- hosts: ceph_osds
+ hosts: cephs
become: true
roles:
- ceph_osd
diff --git a/releasenotes/notes/simplify-inventory-structure-07ac1eea6b173eee.yaml b/releasenotes/notes/simplify-inventory-structure-07ac1eea6b173eee.yaml
new file mode 100644
index 0000000..f580ac7
--- /dev/null
+++ b/releasenotes/notes/simplify-inventory-structure-07ac1eea6b173eee.yaml
@@ -0,0 +1,4 @@
+---
+features:
+ - Simplified the structure of the required inventory to 3 groups only which
+ are ``controllers``, ``cephs`` and ``computes``.
diff --git a/roles/ceph_csi_rbd/defaults/main.yml b/roles/ceph_csi_rbd/defaults/main.yml
index 025bca2..3dd8f08 100644
--- a/roles/ceph_csi_rbd/defaults/main.yml
+++ b/roles/ceph_csi_rbd/defaults/main.yml
@@ -20,7 +20,7 @@
# .. envvar:: ceph_csi_rbd_mons_group [[[
#
# Ansible group that contains all Ceph monitors
-ceph_csi_rbd_mons_group: ceph_mons
+ceph_csi_rbd_mons_group: controllers
# ]]]
# .. envvar:: ceph_csi_rbd_id [[[
diff --git a/roles/ceph_mon/defaults/main.yml b/roles/ceph_mon/defaults/main.yml
index f001f84..86c1717 100644
--- a/roles/ceph_mon/defaults/main.yml
+++ b/roles/ceph_mon/defaults/main.yml
@@ -14,7 +14,7 @@
# .. envvar:: ceph_mon_group [[[
#
# Name of Ansible group that contains all Ceph monitors
-ceph_mon_group: ceph_mons
+ceph_mon_group: controllers
# ]]]
# .. envvar:: ceph_mon_cluster_network [[[
diff --git a/roles/ceph_osd/defaults/main.yml b/roles/ceph_osd/defaults/main.yml
index 844bdee..9671346 100644
--- a/roles/ceph_osd/defaults/main.yml
+++ b/roles/ceph_osd/defaults/main.yml
@@ -14,6 +14,6 @@
# .. envvar:: ceph_osd_mons_group [[[
#
# Name of Ansible group that contains all Ceph monitors
-ceph_osd_mons_group: ceph_mons
+ceph_osd_mons_group: controllers
# ]]]