Revert "os-43 disable explicit control-node and collector IP definition"
Revert "os-43 disable explicit control-node and collector IP definition"

This reverts commit c3f71b1482c30fb67a133e242fb7adebb711ed76.

syseleven/puppet-contrail,syseleven/puppet-contrail,syseleven/puppet-contrail,syseleven/puppet-contrail