Fix etcd config.json template

seunghun1ee · Alex-Welsh · commit 80d61dc1fe1b · 2025-08-11T09:38:36.000+01:00
Currently, if etcd TLS is not enabled but copying CA into containers is enabled, the etcd.json.j2 will produce json file with trailing comma problem. Fixing this by wrapping comma with if condition. Closes-bug: #2119643 Change-Id: I869b3cc2c35afe20cd7c6fd42ff4053e7d51cd32 Signed-off-by: Seunghun Lee <seunghun@stackhpc.com> (cherry picked from commit d2fb825)
diff --git a/ansible/roles/etcd/templates/etcd.json.j2 b/ansible/roles/etcd/templates/etcd.json.j2
@@ -13,7 +13,7 @@
             "dest": "/etc/etcd/certs/etcd-key.pem",
             "owner": "etcd",
             "perm": "0600"
-        }{% endif %}{% if etcd_copy_certs | bool %},
+        }{% endif %}{% if etcd_enable_tls | bool and etcd_copy_certs | bool %},{% endif %}{% if etcd_copy_certs | bool %}
         {
             "source": "{{ container_config_directory }}/ca-certificates",
             "dest": "/var/lib/kolla/share/ca-certificates",

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"dest": "/etc/etcd/certs/etcd-key.pem",`
`14`	`14`	`"owner": "etcd",`
`15`	`15`	`"perm": "0600"`
`16`		`- }{% endif %}{% if etcd_copy_certs \| bool %},`
	`16`	`+ }{% endif %}{% if etcd_enable_tls \| bool and etcd_copy_certs \| bool %},{% endif %}{% if etcd_copy_certs \| bool %}`
`17`	`17`	`{`
`18`	`18`	`"source": "{{ container_config_directory }}/ca-certificates",`
`19`	`19`	`"dest": "/var/lib/kolla/share/ca-certificates",`