cherry-pick changes from master

cherry-pick master/461de0c58bd0b86e1db76dec913786b1eb56479e
apply https://github.com/rcbops-cookbooks/nova-network/pull/105