group updates to public branch

lj020326 · Nov 14, 2024 · 877619c · 877619c
1 parent 5eb6143
commit 877619c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.jenkins/runAllBuilds.groovy b/.jenkins/runAllBuilds.groovy
@@ -12,7 +12,10 @@ Logger log = new Logger(this)
 String jobBaseFolder = "${JOB_NAME.substring(0, JOB_NAME.lastIndexOf("/"))}"
 log.info("jobBaseFolder=${jobBaseFolder}")
 
-Map config = readYaml text: configYmlStr
+// Map config = readYaml text: configYmlStr
+Map config = [:]
+
+log.info("JENKINS_ENV=${JENKINS_ENV}")
 
 config.configFile = ".jenkins/vm-templates.${JENKINS_ENV}.yml"
 config.jobBaseFolder = jobBaseFolder

diff --git a/ansible b/ansible
+4 −2		.github/workflows/molecule.yml
+20 −20		README.md
+2 −2		docs/ansible/ansible-idempotent-roles/ansible-idempotent-roles.md
+53 −0		docs/ansible/ansible-managing-user-rbac-across-multiple-domains.md
+2 −2		inventory/group_vars/all/000_cross_env_vars.yml
+3 −3		inventory/group_vars/docker_stack.yml
+11 −11		inventory/group_vars/docker_stack_openldap.yml
+6 −2		inventory/group_vars/postfix_server.yml
+2 −0		roles/apply_common_groups/tasks/main.yml
+78 −67		roles/bootstrap_docker_stack/templates/jenkins/jenkins_casc.yml.j2
+78 −67		roles/bootstrap_docker_stack/templates/jenkins_jcac/jenkins_casc.yml.j2
+2 −2		roles/bootstrap_docker_stack/templates/openldap/ldap_seed_info.ldif.j2
+32 −18		roles/bootstrap_docker_stack/templates/openldap/ldap_seed_info.new.ldif.j2
+15 −2		roles/bootstrap_docker_stack/vars/app-services/common/docker_stack_jenkins.yml
+6 −2		roles/bootstrap_docker_stack/vars/app-services/common/docker_stack_jenkins_agent.yml
+15 −2		roles/bootstrap_docker_stack/vars/app-services/common/docker_stack_jenkins_jcac.yml
+1 −1		roles/bootstrap_docker_stack/vars/app-services/common/docker_stack_openldap.yml
+89 −10		run-playbook.sh