Merge branch 'main' into monitor

Author: obnoxxx

.gitignore

@@ -1,8 +1,8 @@
 *~
 playbooks/.vagrant
-playbooks/ansible/vagrant_ansible_inventory
+playbooks/ansible/site_inventory
 playbooks/ansible/ssh-config-setup
-playbooks/vagrant_ansible_inventory
+playbooks/site_inventory
 playbooks/ssh-config-host
 playbooks/Vagrantfile
 playbooks/ansible/config.yml

devel/Makefile

@@ -5,3 +5,9 @@ fix_ssh:
 
 centos8_build_setup:
 	@ansible-playbook -i ${INVENTORY} centos8_build_setup.yml
+
+centos9_build_setup:
+	@ansible-playbook -i ${INVENTORY} centos9_build_setup.yml
+
+single_node_samba_cluster:
+	@ansible-playbook -i ${INVENTORY} single_node_samba_cluster.yml

devel/centos8_build_setup.yml

@@ -1,5 +1,5 @@
 ---
-- hosts: cluster
+- hosts: storage0
   become: yes
   tasks:
 

devel/centos9_build_setup.yml

@@ -0,0 +1,98 @@
+---
+- hosts: storage0
+  become: yes
+  tasks:
+
+    - name: Install storage SIG packages
+      dnf:
+        name:
+          - centos-release-gluster10
+
+    # Grabbed list of packages from
+    # https://github.com/samba-in-kubernetes/samba-build/blob/main/packaging/samba-4.19.spec.j2
+    - name: Install required rpms
+      dnf:
+        name:
+          - git
+          - gdb
+          - make
+          - gcc
+          - glibc-gconv-extra
+          - avahi-devel
+          - bison
+          - cups-devel
+          - dbus-devel
+          - docbook-style-xsl
+          - e2fsprogs-devel
+          - flex
+          - gawk
+          - gnupg2
+          - gnutls-devel
+          - gpgme-devel
+          - jansson-devel
+          - krb5-devel
+          - libacl-devel
+          - libaio-devel
+          - libarchive-devel
+          - libattr-devel
+          - libcap-devel
+          - libicu-devel
+          - libcmocka-devel
+          - libtirpc-devel
+          - libuuid-devel
+          - libxslt
+          - lmdb
+          - mingw32-gcc
+          - mingw64-gcc
+          - ncurses-devel
+          - openldap-devel
+          - pam-devel
+          - perl-interpreter
+          - perl-generators
+          - perl(Archive::Tar)
+          - perl(Test::More)
+          - popt-devel
+          - python3-cryptography
+          - python3-devel
+          - python3-dns
+          - python3-requests
+          - python3-setuptools
+          - quota-devel
+          - readline-devel
+          - rpcgen
+          - rpcsvc-proto-devel
+          - sed
+          - systemd-rpm-macros
+          - libtasn1-devel
+          - libtasn1-tools
+          - xfsprogs-devel
+          - xz
+          - zlib-devel
+          - pkgconfig(libsystemd)
+          - mold
+          - libgfapi-devel
+          - libglusterfs-devel
+          - libcephfs-devel
+          - liburing-devel
+          - pcp-libs-devel
+          - librados-devel
+          - python3-iso8601
+          - python3-pyasn1
+          - bind
+          - krb5-server
+          - perl(ExtUtils::MakeMaker)
+          - perl(FindBin)
+          - perl(Parse::Yapp)
+          - lmdb-devel
+          - bind
+          - krb5-server
+          - python3-dateutil
+          - python3-iso8601
+          - python3-pyasn1
+          - ldb-tools
+          - python3-gpg
+          - python3-markdown
+          - python3-cryptography
+          - python3-setproctitle
+          - tdb-tools
+        state: latest

devel/inventory

@@ -1 +1 @@
-../vagrant/vagrant_ansible_inventory
+../playbooks/site_inventory

devel/single_node_samba_cluster.yml

@@ -0,0 +1,27 @@
+---
+- hosts: cluster
+  become: yes
+  tasks:
+
+    - name: Stop ctdb service
+      ansible.builtin.service:
+        name: ctdb
+        state: stopped
+        enabled: no
+
+    - name: Disable clustering in smb.conf
+      ansible.builtin.lineinfile:
+        path: /etc/samba/smb.conf
+        search_string: "clustering"
+        line: clustering = no
+
+    - name: Start smb service on storage0
+      ansible.builtin.service:
+        name: smb
+        state: started
+        enabled: yes
+      when: ansible_hostname == "storage0"
+
+    - name: Add test1 user to samba standalone tdb
+      shell: (echo x; echo x)|smbpasswd -a test1
+      when: ansible_hostname == "storage0"

playbooks/Makefile

@@ -1,6 +1,5 @@
-INVENTORY := ./vagrant_ansible_inventory
+INVENTORY := ./site_inventory
 VSSH := ssh -F ssh-config-host
-VAGRANT := vagrant
 
 ifdef EXTRA_VARS
 	ANSIBLE_EXTRA_VARS := -e '${EXTRA_VARS}'
@@ -25,34 +24,28 @@ setup.test.only:
 	@ansible-playbook --inventory=$(INVENTORY) ${ANSIBLE_EXTRA_VARS} setup.test.yml
 
 setup.cluster.only:
-	@$(VSSH) admin "${SSH_EXTRA_VARS} make -C /home/vagrant/ansible setup.cluster"
+	@$(VSSH) admin "${SSH_EXTRA_VARS} make -C ansible setup.cluster"
 
 setup.cluster: setup.prep setup.test.only setup.cluster.only
 
 setup.clients:
-	@$(VSSH) admin "${SSH_EXTRA_VARS} make -C /home/vagrant/ansible setup.clients"
+	@$(VSSH) admin "${SSH_EXTRA_VARS} make -C ansible setup.clients"
 
 generate.report:
-	@$(VSSH) admin "${SSH_EXTRA_VARS} make -C /home/vagrant/ansible generate.report"
+	@$(VSSH) admin "${SSH_EXTRA_VARS} make -C ansible generate.report"
 
 nodes.statedump:
 	@ansible-playbook --inventory $(INVENTORY) ${ANSIBLE_EXTRA_VARS} nodes.statedump.yml
 
 client.test:
-	@$(VSSH) admin "${SSH_EXTRA_VARS} make -C /home/vagrant/ansible client.test"
+	@$(VSSH) admin "${SSH_EXTRA_VARS} make -C ansible client.test"
 
 setup.site: setup.cluster setup.clients generate.report client.test
 
 client1.test:
 	@$(VSSH) clients "sudo make -C /root/sit-test-cases test"
 
-clean_vagrant:
-	-$(VAGRANT) destroy -f
-	-rm -rf .vagrant
+clean:
+	@ansible-playbook --inventory localhost, ${ANSIBLE_EXTRA_VARS} cleanup.yml
 
-clean_generated_files:
-	-rm -f Vagrantfile ansible/config.yml ansible/vagrant_ansible_inventory ansible/ssh-config-setup vagrant_ansible_inventory ssh-config-host
-
-clean: clean_vagrant clean_generated_files
-
-.PHONY: local hosts.update.only setup.prep.only setup.prep setup.test.only setup.cluster.only setup.cluster setup.clients client.test setup.site client1.test clean_vagrant clean_generated_files clean
+.PHONY: local hosts.update.only setup.prep.only setup.prep setup.test.only setup.cluster.only setup.cluster setup.clients client.test setup.site client1.test clean

playbooks/ansible/Makefile

@@ -1,4 +1,4 @@
-INVENTORY := ./vagrant_ansible_inventory
+INVENTORY := ./site_inventory
 
 ifdef EXTRA_VARS
 	ANSIBLE_EXTRA_VARS := -e '${EXTRA_VARS}'
@@ -17,7 +17,7 @@ generate.report:
 	@ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./generate-report.yml
 
 client.test:
-	@ANSIBLE_STDOUT_CALLBACK=debug ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./client-test.yml
+	@ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./client-test.yml
 
 setup.site: setup.cluster setup.clients client.test