changed ipaddress
Merge branch 'master' into puppet-test-pxe-develop