From cf28d0a7711ceefdde4100495c8278278d27d148 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Sun, 29 Oct 2017 16:57:56 -0400
Subject: Use openshift.node.registry_url instead of oreg_url
Consistent with other use
---
roles/openshift_master/defaults/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles/openshift_master')
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index 3da861d03..e78c78bb2 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -71,7 +71,7 @@ openshift_master_bootstrap_enabled: False
openshift_master_client_binary: "{{ openshift.common.client_binary if openshift is defined else 'oc' }}"
-openshift_master_config_imageconfig_format: "{{ oreg_url if oreg_url != '' else 'registry.access.redhat.com/openshift3/ose-${component}:${version}' }}"
+openshift_master_config_imageconfig_format: "{{ openshift.node.registry_url }}"
# these are for the default settings in a generated node-config.yaml
openshift_master_node_config_default_edits:
--
cgit v1.2.3
From d3730aa2dcd3f68513fe350e115e1a44e7c4c229 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Mon, 30 Oct 2017 22:02:05 -0400
Subject: Use global IP to indicate node should pick DNS
---
roles/openshift_master/tasks/bootstrap.yml | 1 +
1 file changed, 1 insertion(+)
(limited to 'roles/openshift_master')
diff --git a/roles/openshift_master/tasks/bootstrap.yml b/roles/openshift_master/tasks/bootstrap.yml
index eee89743c..4fdfa6330 100644
--- a/roles/openshift_master/tasks/bootstrap.yml
+++ b/roles/openshift_master/tasks/bootstrap.yml
@@ -42,6 +42,7 @@
--node-dir={{ mktempout.stdout }}/
--node=CONFIGMAP
--hostnames=test
+ --dns-ip=0.0.0.0
--certificate-authority={{ openshift_master_config_dir }}/ca.crt
--signer-cert={{ openshift_master_config_dir }}/ca.crt
--signer-key={{ openshift_master_config_dir }}/ca.key
--
cgit v1.2.3