<openshift.ks> add static_ip_addr
Merge remote-tracking branch 'origin/staticip' into staticip