summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWesley Hearn <whearn@redhat.com>2015-04-22 10:49:29 -0400
committerWesley Hearn <whearn@redhat.com>2015-04-22 10:49:29 -0400
commit2823c990eda7abd19447b988131f2c0eb8a9fdcc (patch)
tree28e514bb7cb2c007240e1b2a4c3d25347eb07dfe
parent3e6f58be448c3e11d87b5b4573d12512ae2eca24 (diff)
downloadopenshift-2823c990eda7abd19447b988131f2c0eb8a9fdcc.tar.gz
openshift-2823c990eda7abd19447b988131f2c0eb8a9fdcc.tar.bz2
openshift-2823c990eda7abd19447b988131f2c0eb8a9fdcc.tar.xz
openshift-2823c990eda7abd19447b988131f2c0eb8a9fdcc.zip
Use docker-registry.ops when deploying as online
-rw-r--r--roles/openshift_master/tasks/main.yml6
-rw-r--r--roles/openshift_register_nodes/tasks/main.yml6
2 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 3ea485610..da184e972 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -53,6 +53,12 @@
set_fact:
openshift_registry_url: "openshift3_beta/ose-${component}:${version}"
when: openshift.common.deployment_type == 'enterprise' and openshift_registry_url is not defined
+
+- name: Use online default for openshift_registry_url if not set
+ set_fact:
+ openshift_registry_url: "docker-registry.ops.rhcloud.com/openshift3_beta/ose-${component}:${version}"
+ when: openshift.common.deployment_type == 'online' and openshift_registry_url is not defined
+
- name: Create master config
command: >
/usr/bin/openshift start master --write-config
diff --git a/roles/openshift_register_nodes/tasks/main.yml b/roles/openshift_register_nodes/tasks/main.yml
index 85f490f70..85bead16d 100644
--- a/roles/openshift_register_nodes/tasks/main.yml
+++ b/roles/openshift_register_nodes/tasks/main.yml
@@ -10,6 +10,12 @@
set_fact:
openshift_registry_url: "openshift3_beta/ose-${component}:${version}"
when: openshift.common.deployment_type == 'enterprise' and openshift_registry_url is not defined
+
+- name: Use online default for openshift_registry_url if not set
+ set_fact:
+ openshift_registry_url: "docker-registry.ops.rhcloud.com/openshift3_beta/ose-${component}:${version}"
+ when: openshift.common.deployment_type == 'online' and openshift_registry_url is not defined
+
- name: Create node config
command: >
/usr/bin/openshift admin create-node-config