Don't use mixture of cfg.Opt() deprecated args
Don't use mixture of cfg.Opt() deprecated args

No need to make this any more ugly than it needs to be :)

Change-Id: Ib7ef13bb5f04e1780565de805eb81413d7b21274

magic0704/oslo.db,varunarya10/oslo.db,openstack/oslo.db,JioCloud/oslo.db,vikt0rs/oslo.db,akash1808/oslo.db,openstack/oslo.db,malor/oslo.db