shixiong/okd @ c89a8657ef2e7ef2f5c9cd6929225b0adb742dd0

OpenShift Bot 60360f5e60 Merge pull request #4894 from tbielawa/reg-dns-scaleup-bz1469336		7 gadi atpakaļ
..
files	c37fbea2f7 Fix templating of static service files	8 gadi atpakaļ
main.yml	fbb5f4c002 Tolerate non existence of /etc/sysconfig/atomic-openshift-master	7 gadi atpakaļ
set_loopback_context.yml	81345f2ee5 conditionalize loopback config on v >= 3.2/1.2	9 gadi atpakaļ
system_container.yml	2c7a684909 Use meta/main.yml for role dependencies	8 gadi atpakaļ
systemd_units.yml	88c946de1c Use existing OPENSHIFT_DEFAULT_REGISTRY setting during masters scaleup	7 gadi atpakaļ