Mainline is same as #2 above
https://github.com/Juniper/contrail-puppet/commit/76f6d83cd3d10cdc4ca2fee4de80285216b3c019
Mainline is same as #2 above
https:/ /github. com/Juniper/ contrail- puppet/ commit/ 76f6d83cd3d10cd c4ca2fee4de8028 5216b3c019