From 2823c990eda7abd19447b988131f2c0eb8a9fdcc Mon Sep 17 00:00:00 2001
From: Wesley Hearn <whearn@redhat.com>
Date: Wed, 22 Apr 2015 10:49:29 -0400
Subject: Use docker-registry.ops when deploying as online
---
roles/openshift_master/tasks/main.yml | 6 ++++++
roles/openshift_register_nodes/tasks/main.yml | 6 ++++++
2 files changed, 12 insertions(+)
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
--
cgit v1.2.3