Merged from contrail-chef repo
Removed the search role:*database* function