shixiong/okd @ f7db81c1d1b80fd0907a8786f76dc823ad1d041d

Scott Dodson 50f6cd4fe3 Remove openshift_dns_ip configuration, not valid in 3.10		6 gadi atpakaļ
..
bootstrap.yml.j2	ddf1aa2f1a Switch the master to always run with bootstrapping on	7 gadi atpakaļ
multipath.conf.j2	4381c4924d fix bz 1550271: restore mpath defaults config	7 gadi atpakaļ
node.service.j2	8c0ce4e740 In master bootstrapping mode, use the new openshift_control_plane role	7 gadi atpakaļ
node.yaml.v1.j2	50f6cd4fe3 Remove openshift_dns_ip configuration, not valid in 3.10	6 gadi atpakaļ
origin-dns.conf.j2	edf2b70c36 Merge pull request #8187 from digi691/no_negcache	7 gadi atpakaļ