From 4df064141f1e235347f448531ca2f611f38a97ac Mon Sep 17 00:00:00 2001 From: Ted Cook Date: Sat, 13 Jan 2024 18:25:20 -0600 Subject: [PATCH] Change default trace value to string --- Makefile | 2 +- defaults/main.yml | 2 +- molecule/hold/molecule.yml | 16 ++++++++-------- molecule/install/molecule.yml | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 8b82896..f939d74 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all ${MAKECMDGOALS} MOLECULE_SCENARIO ?= install -MOLECULE_DOCKER_IMAGE ?= ubuntu2004 +MOLECULE_DOCKER_IMAGE ?= ubuntu2204 GALAXY_API_KEY ?= GITHUB_REPOSITORY ?= $$(git config --get remote.origin.url | cut -d: -f 2 | cut -d. -f 1) GITHUB_ORG = $$(echo ${GITHUB_REPOSITORY} | cut -d/ -f 1) diff --git a/defaults/main.yml b/defaults/main.yml index 7e66a1c..d539ed1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,7 +12,7 @@ mongos_service_enabled: "{{ mongos_service_state != 'stopped' }}" mongos_config_file: /etc/mongos.yaml mongos_config_verbosity: 2 mongos_config_bindip: 127.0.0.1 -mongos_config_log_trace: true +mongos_config_log_trace: 'false' mongos_config_timestamp_format: iso8601-utc mongos_storage_path: /var/lib/mongodb mongos_replicaset_config_name: config diff --git a/molecule/hold/molecule.yml b/molecule/hold/molecule.yml index 5710259..d2e601b 100644 --- a/molecule/hold/molecule.yml +++ b/molecule/hold/molecule.yml @@ -9,7 +9,7 @@ driver: platforms: - name: mongos-hold-mongos01 image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest" - command: ${MOLECULE_DOCKER_COMMAND:-""} + command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"} cgroupns_mode: host privileged: true pre_build_image: true @@ -22,7 +22,7 @@ platforms: - mongos - name: mongos-hold-mongos02 image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest" - command: ${MOLECULE_DOCKER_COMMAND:-""} + command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"} cgroupns_mode: host privileged: true pre_build_image: true @@ -35,7 +35,7 @@ platforms: - mongos - name: mongos-hold-config01 image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest" - command: ${MOLECULE_DOCKER_COMMAND:-""} + command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"} cgroupns_mode: host privileged: true pre_build_image: true @@ -48,7 +48,7 @@ platforms: - config - name: mongos-hold-config02 image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest" - command: ${MOLECULE_DOCKER_COMMAND:-""} + command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"} cgroupns_mode: host privileged: true pre_build_image: true @@ -61,7 +61,7 @@ platforms: - config - name: mongos-hold-config03 image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest" - command: ${MOLECULE_DOCKER_COMMAND:-""} + command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"} cgroupns_mode: host privileged: true pre_build_image: true @@ -74,7 +74,7 @@ platforms: - config - name: mongos-hold-shard01 image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest" - command: ${MOLECULE_DOCKER_COMMAND:-""} + command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"} cgroupns_mode: host privileged: true pre_build_image: true @@ -87,7 +87,7 @@ platforms: - shard - name: mongos-hold-shard02 image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest" - command: ${MOLECULE_DOCKER_COMMAND:-""} + command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"} cgroupns_mode: host privileged: true pre_build_image: true @@ -100,7 +100,7 @@ platforms: - shard - name: mongos-hold-shard03 image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest" - command: ${MOLECULE_DOCKER_COMMAND:-""} + command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"} cgroupns_mode: host privileged: true pre_build_image: true diff --git a/molecule/install/molecule.yml b/molecule/install/molecule.yml index 4edf1dc..fd9445b 100644 --- a/molecule/install/molecule.yml +++ b/molecule/install/molecule.yml @@ -121,6 +121,5 @@ provisioner: mongos_replicaset_config_name: config mongos_replicaset_shard_name: shard mongodb_shell: mongosh - mongos_config_bindip: "{{ ansible_default_ipv4.address }}" verifier: name: ansible