summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-02 10:55:48 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-02 10:55:48 -0500
commite55ef121003649cfe72bb51c6d51a492898f328a (patch)
treeea60364ae26e15feabbe3c4d4d8d8d24630cba93
parent17feda9c8694da54e63294aa926209cf33b54101 (diff)
parent87cb07bc85ee3965927c8799204f4ef0d172e145 (diff)
downloadopenshift-e55ef121003649cfe72bb51c6d51a492898f328a.tar.gz
openshift-e55ef121003649cfe72bb51c6d51a492898f328a.tar.bz2
openshift-e55ef121003649cfe72bb51c6d51a492898f328a.tar.xz
openshift-e55ef121003649cfe72bb51c6d51a492898f328a.zip
Merge pull request #88 from detiber/openshiftRegistryOverride
add support for overriding default registry url
-rw-r--r--roles/openshift_master/tasks/main.yml9
-rw-r--r--roles/openshift_node/tasks/main.yml9
2 files changed, 18 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 07483c0d6..0b3842856 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -21,6 +21,15 @@
notify:
- restart openshift-master
+- name: Set default registry url
+ lineinfile:
+ dest: /etc/sysconfig/openshift-master
+ regexp: '^IMAGES='
+ line: "IMAGES={{ openshift_registry_url }}"
+ when: openshift_registry_url is defined
+ notify:
+ - restart openshift-master
+
- name: Set master OpenShift facts
include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
facts:
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 9015cae80..b908e325b 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -30,6 +30,15 @@
notify:
- restart openshift-node
+- name: Set default registry url
+ lineinfile:
+ dest: /etc/sysconfig/openshift-node
+ regexp: '^IMAGES='
+ line: "IMAGES={{ openshift_registry_url }}"
+ when: openshift_registry_url is defined
+ notify:
+ - restart openshift-node
+
- name: Set OpenShift node facts
include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
facts: