Skip to content

Commit

Permalink
bridge: Use correct (legacy) role names in database.
Browse files Browse the repository at this point in the history
The vswitchd database schema requires role names to be "master" or
"slave", but this code tried to use "primary" and "secondary".

Signed-off-by: Ben Pfaff <blp@ovn.org>
Reported-at: openvswitch/ovs-issues#218
Tested-at: openvswitch/ovs-issues#218 (comment)
Fixes: 807152a ("Use primary/secondary, not master/slave, as names for OpenFlow roles.")
  • Loading branch information
blp committed Jul 7, 2021
1 parent 828d9cb commit 4e948b8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions vswitchd/bridge.c
Expand Up @@ -3019,9 +3019,9 @@ ofp12_controller_role_to_str(enum ofp12_controller_role role)
case OFPCR12_ROLE_EQUAL:
return "other";
case OFPCR12_ROLE_PRIMARY:
return "primary";
return "master";
case OFPCR12_ROLE_SECONDARY:
return "secondary";
return "slave";
case OFPCR12_ROLE_NOCHANGE:
default:
return NULL;
Expand Down

0 comments on commit 4e948b8

Please sign in to comment.