Browse Source

Use docker-registry.ops when deploying as online

Wesley Hearn 10 years ago
parent
commit
2823c990ed

+ 6 - 0
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

+ 6 - 0
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