Merge pull request metal3-io#1257 from Nordix/revert-1255-enable-mari…

…adb-moshiur Revert "Use MariaDB instead of SQLite"
Nordix · Jul 19, 2023 · ae5dcbd · ae5dcbd
2 parents 9244e80 + fd1496b
commit ae5dcbd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/03_launch_mgmt_cluster.sh b/03_launch_mgmt_cluster.sh
@@ -23,7 +23,7 @@ fi
 if [ "${IRONIC_BASIC_AUTH}" == "false" ]; then
   BMO_IRONIC_ARGS+=("-n")
 fi
-if [ "${IRONIC_USE_MARIADB:-true}" == "true" ]; then
+if [ "${IRONIC_USE_MARIADB:-false}" == "true" ]; then
   BMO_IRONIC_ARGS+=("-m")
 fi
 
@@ -157,7 +157,7 @@ CACHEURL=http://${BARE_METAL_PROVISIONER_URL_HOST}/images
 IRONIC_FAST_TRACK=true
 RESTART_CONTAINER_CERTIFICATE_UPDATED="${RESTART_CONTAINER_CERTIFICATE_UPDATED}"
 IRONIC_RAMDISK_SSH_KEY=${SSH_PUB_KEY_CONTENT}
-IRONIC_USE_MARIADB=${IRONIC_USE_MARIADB:-true}
+IRONIC_USE_MARIADB=${IRONIC_USE_MARIADB:-false}
 EOF
 
   if [ -n "${DEPLOY_ISO_URL}" ]; then

diff --git a/tests/roles/run_tests/vars/main.yml b/tests/roles/run_tests/vars/main.yml
@@ -84,7 +84,7 @@ IMAGE_CHECKSUM: "http://{{ BARE_METAL_PROVISIONER_IP }}/images/{{ RAW_IMAGE_NAME
 GOPATH: "{{ lookup('env', 'GOPATH')}}"
 IRONIC_TLS_SETUP: "{{ lookup('env', 'IRONIC_TLS_SETUP') | default('true', true) }}"
 IRONIC_BASIC_AUTH: "{{ lookup('env', 'IRONIC_BASIC_AUTH') | default('true', true) }}"
-IRONIC_USE_MARIADB: "{{ lookup('env', 'IRONIC_USE_MARIADB') | default('true', true) }}"
+IRONIC_USE_MARIADB: "{{ lookup('env', 'IRONIC_USE_MARIADB') | default('false', true) }}"
 
 # Args to pass to the deploy.sh script when deploying Ironic and BMO
 # [k]eepalived [t]ls [n]o basic auth or [m]ariadb

diff --git a/vars.md b/vars.md
@@ -76,7 +76,7 @@ assured that they are persisted.
 | IRONIC_INSPECTOR_USERNAME | Username for Ironic inspector basic auth | | |
 | IRONIC_PASSWORD | Password for Ironic basic auth | | |
 | IRONIC_INSPECTOR_PASSWORD | Password for Ironic inspector basic auth | | |
-| IRONIC_USE_MARIADB | Use MariaDB instead of SQLite. Setting this to "true" does not work with v0.2.0 and older versions of BMO. MariaDB cannot be used without TLS. | "true", "true" | "true" |
+| IRONIC_USE_MARIADB | Use MariaDB instead of SQLite. Setting this to "true" does not work with v0.2.0 and older versions of BMO. MariaDB cannot be used without TLS. | "true", "false" | "false" |
 | REGISTRY_PORT | Container image registry port | | 5000 |
 | HTTP_PORT | Httpd server port | | 6180 |
 | IRONIC_INSPECTOR_PORT | Ironic Inspector port | | 5050 |