Few more variables consolidated

moved cobbler variables into core.pp