Merge "barometer: move to opnfv puppet repo"