Merge "Fix etcd config.json template" into stable/2025.1

Zuul · openstack-gerrit · commit 668b71eff47e · 2025-08-07T16:10:44.000Z
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",`