Skip to content

Commit

Permalink
treewide: Disable storing of other_config in external_ids
Browse files Browse the repository at this point in the history
The update of having other_config instead of external_ids
for configuration has been in place for some time.
Version that released with this change was 20.06, that
is plenty of time so we don't have to keep the compatibility
anymore. Remove the updates of external_ids it will be stored
only in other_config from now on.

Signed-off-by: Ales Musil <amusil@redhat.com>
Acked-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Numan Siddique <numans@ovn.org>
  • Loading branch information
almusil authored and numansiddique committed Aug 16, 2022
1 parent 1871fdd commit 5130942
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 18 deletions.
1 change: 1 addition & 0 deletions NEWS
Expand Up @@ -14,6 +14,7 @@ Post v22.06.0
NAT-T UDP encapsulation. Requires OVS support for IPsec custom tunnel
options (which will be available in OVS 2.18).
- Removed possibility of disabling logical datapath groups.
- Removed the copying of SB's Chassis other_config into external_ids.

OVN v22.06.0 - 03 Jun 2022
--------------------------
Expand Down
4 changes: 0 additions & 4 deletions TODO.rst
Expand Up @@ -139,10 +139,6 @@ OVN To-do List

* Packaging for RHEL, Debian, etc.

* ovn-controller: Stop copying the local OVS configuration into the
Chassis external_ids column (same for the "is-remote" configuration from
ovn-ic) a few releases after the 20.06 version (21.06 maybe ?).

* ovn-controller: Remove backwards compatibility for Southbound DB Port_Group
names in expr.c a few releases after the 20.09 version. Right now
ovn-controller maintains backwards compatibility when connecting to a
Expand Down
4 changes: 0 additions & 4 deletions controller/chassis.c
Expand Up @@ -623,10 +623,6 @@ chassis_update(const struct sbrec_chassis *chassis_rec,
chassis_build_other_config(ovs_cfg, &other_config);
sbrec_chassis_verify_other_config(chassis_rec);
sbrec_chassis_set_other_config(chassis_rec, &other_config);
/* TODO(lucasagomes): Continue writing the configuration to the
* external_ids column for backward compatibility with the current
* systems, this behavior should be removed in the future. */
sbrec_chassis_set_external_ids(chassis_rec, &other_config);
smap_destroy(&other_config);
updated = true;
}
Expand Down
4 changes: 0 additions & 4 deletions ic/ovn-ic.c
Expand Up @@ -313,10 +313,6 @@ sync_isb_gw_to_sb(struct ic_context *ctx,
{
sbrec_chassis_set_hostname(chassis, gw->hostname);
sbrec_chassis_update_other_config_setkey(chassis, "is-remote", "true");
/* TODO(lucasagomes): Continue writing the configuration to the
* external_ids column for backward compatibility with the current
* systems, this behavior should be removed in the future. */
sbrec_chassis_update_external_ids_setkey(chassis, "is-remote", "true");

/* Sync encaps used by this gateway. */
ovs_assert(gw->n_encaps);
Expand Down
6 changes: 0 additions & 6 deletions tests/ovn-ic.at
Expand Up @@ -148,12 +148,6 @@ AT_CHECK([ovn_as az2 ovn-sbctl -f csv -d bare --no-headings --columns other_conf
is-remote=true
])

# TODO(lucasagomes): Remove this check when we get rid of the behavior
# of writting configuration to the Chassis external_ids column.
AT_CHECK([ovn_as az2 ovn-sbctl -f csv -d bare --no-headings --columns external_ids list chassis], [0], [dnl
is-remote=true
])

ovs-vsctl set open . external-ids:ovn-is-interconn=false
AT_CHECK([ovn_as az2 ovn-sbctl show], [0], [dnl
])
Expand Down

0 comments on commit 5130942

Please sign in to comment.