CI fix: Use the un-deprecated v3 etcd API

jayofdoom · jayofdoom · commit 7edd1734a372 · 2023-09-20T13:14:09.000-07:00
Tooz defaults no longer work with the etcd version we're using.

Change-Id: I400f0dcfff839d17319b03b81a8bf3f7de0787a4
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
@@ -65,7 +65,7 @@ function configure_for_dlm {
     # set lock acquire timeout
     populate_ml2_config $GENERIC_SWITCH_INI_FILE ngs_coordination acquire_timeout=$GENERIC_SWITCH_DLM_ACQUIRE_TIMEOUT
     # set ectd3 backend
-    populate_ml2_config $GENERIC_SWITCH_INI_FILE ngs_coordination backend_url="etcd3+http://${SERVICE_HOST}:${ETCD_PORT:-2379}"
+    populate_ml2_config $GENERIC_SWITCH_INI_FILE ngs_coordination backend_url="etcd3+http://${SERVICE_HOST}:${ETCD_PORT:-2379}?api_version=v3"
     }
 
 function configure_generic_switch_ssh_keypair {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ function configure_for_dlm {`
`65`	`65`	`# set lock acquire timeout`
`66`	`66`	`populate_ml2_config $GENERIC_SWITCH_INI_FILE ngs_coordination acquire_timeout=$GENERIC_SWITCH_DLM_ACQUIRE_TIMEOUT`
`67`	`67`	`# set ectd3 backend`
`68`		`- populate_ml2_config $GENERIC_SWITCH_INI_FILE ngs_coordination backend_url="etcd3+http://${SERVICE_HOST}:${ETCD_PORT:-2379}"`
	`68`	`+ populate_ml2_config $GENERIC_SWITCH_INI_FILE ngs_coordination backend_url="etcd3+http://${SERVICE_HOST}:${ETCD_PORT:-2379}?api_version=v3"`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`function configure_generic_switch_ssh_keypair {`