diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-04-22 10:57:21 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-04-22 10:57:21 -0400 |
| commit | c4bb64ae7f55596cb76cfc644235657212a0744a (patch) | |
| tree | 28e514bb7cb2c007240e1b2a4c3d25347eb07dfe | |
| parent | 3e6f58be448c3e11d87b5b4573d12512ae2eca24 (diff) | |
| parent | 2823c990eda7abd19447b988131f2c0eb8a9fdcc (diff) | |
| download | openshift-c4bb64ae7f55596cb76cfc644235657212a0744a.tar.gz openshift-c4bb64ae7f55596cb76cfc644235657212a0744a.tar.bz2 openshift-c4bb64ae7f55596cb76cfc644235657212a0744a.tar.xz openshift-c4bb64ae7f55596cb76cfc644235657212a0744a.zip | |
Merge pull request #175 from wshearn/use_ops_docker_mirror
Use docker-registry.ops when deploying as online
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_register_nodes/tasks/main.yml | 6 |
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 |