Lord McConnell is urging the Scottish Government to build on the legacy of the smoking ban and restrict the use of vapes.