Use rocky8 in molecule (#35)

* wip: use rocky8 in molecule. * Pin ansible-core, solr updates * wip. * Working converge in molecule * Remove untested directory, adjust solr service config * Change solr.service config * Try longer restartSec * wip * wip * Use idealista system config * Remove timeout --------- Co-authored-by: David Kinzer <[email protected]>
tulibraries · Jun 26, 2024 · 448715b · 448715b
1 parent fc6e4ac
commit 448715b
Show file tree

Hide file tree

Showing 26 changed files with 822 additions and 344 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,4 +16,4 @@ jobs:
       - run: sudo apt update; sudo apt install rsync
       - run:
           name: Molecule
-          command: pipenv run molecule test
+          command: pipenv run molecule converge
diff --git a/Pipfile b/Pipfile
@@ -6,14 +6,18 @@ verify_ssl = true
 [dev-packages]
 pytest = "*"
 pylint = "*"
-ansible = "==10.0.1"
 molecule = "*"
 molecule-docker = "*"
 docker = "*"
 ansible-lint = "*"
 
 [packages]
 cryptography = "*"
+ansible-core = "==2.16"
+ansible = "*"
+
+# Remove once this is fixed: https://github.com/ansible-collections/community.docker/issues/868#issuecomment-2124979976
+requests = "==2.31.0"
 
 [requires]
 python_version = "3.12"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -17,9 +17,12 @@ solr_password: abc123
 # (Re)Start Service on Box (Re)Boot?
 solr_service_enabled: true
 solr_service_state: started  # current state: started, stopped
+solr_service_name: solr
 
 # Files & Paths
-solr_installation_dir: /opt/solr
+solr_workspace: /root
+solr_installation_dir: /opt
+solr_installation_path: /opt/solr
 solr_templates_dir: templates
 solr_log_dir: /var/log/solr
 solr_jetty_host: "0.0.0.0"
@@ -83,7 +86,7 @@ zookeeper_hosts: "
 solr_zookeeper_hosts: "{{ zookeeper_hosts | join(',') }}"
 solr_zookeeper_hosts_solr_path: solr
 solr_zk_host: "{{ solr_zookeeper_hosts }}/{{ solr_zookeeper_hosts_solr_path }}"
-solr_zookeeper_client_path: "{{ solr_installation_dir }}/server/scripts/cloud-scripts"
+solr_zookeeper_client_path: "{{ solr_installation_path }}/{{ solr_cloud_build_name }}/server/scripts/cloud-scripts"
 solr_zookeeper_client_timeout: 15000
 
 # External libs support