From de51326431cfa03779f24f2b620d305f1243d559 Mon Sep 17 00:00:00 2001 From: Zuul Date: Fri, 27 May 2022 14:37:54 +0000 Subject: [PATCH] Update git submodules * Update tripleo-ansible from branch 'master' to f83edb68523b330a916adfa550296613890e055c - Merge "Do not set Ceph network options in assimilate_ceph.conf" - Do not set Ceph network options in assimilate_ceph.conf Configure the four paramters (public_network, cluster_network, ms_bind_ipv4 and ms_bind_ipv6) in cephadm_config_set.yaml tasks file instead of in ceph.conf.j2 template. If a user overrides the tripleo_cephadm_assimilate_conf file to provide their own initial Ceph configuration file without any network configuration, then we don't want to loose the network configuration that would have been set from the ceph.conf.j2 template. Thus, we'll ensure the correct network configuration can happen even if the ceph.conf.j2 template is not used. If the tripleo_cephadm_assimilate_conf file contains any of the four parameters, then those parameters will not be set via cephadm_config_set.yaml tasks. This allows users to still override the four parameters via the --config option. The cephadm_config_set.yaml tasks are always called by the apply_spec.yaml tasks before the spec is applied. Thus, we'll know the correct networks are set before any other daemons are added with the exception of the first bootstrapped mon/mgr daemons. The public_network for them is set implicitly via the --mon-ip option. Change-Id: If196dfcd0fd2cec3b7784394e86c4addbfbf039d --- tripleo-ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tripleo-ansible b/tripleo-ansible index 3b8c1d4138..f83edb6852 160000 --- a/tripleo-ansible +++ b/tripleo-ansible @@ -1 +1 @@ -Subproject commit 3b8c1d413828cce42e962181f69708c97c768066 +Subproject commit f83edb68523b330a916adfa550296613890e055c