diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-06-01 16:00:11 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-06-01 16:00:11 -0700 |
| commit | 433e3c77adf99cfaa5d6b8f94d2f0065f187b0fc (patch) | |
| tree | a1e01051d2e971364c4415a673a6c8683b80d2fb /roles/openshift_register_nodes | |
| parent | 92524d99ddcb5365bebf3e73e32ab604581d0fd9 (diff) | |
| parent | 3f486ba15524ece60a2e211416535ca3d40708bc (diff) | |
| download | openshift-433e3c77adf99cfaa5d6b8f94d2f0065f187b0fc.tar.gz openshift-433e3c77adf99cfaa5d6b8f94d2f0065f187b0fc.tar.bz2 openshift-433e3c77adf99cfaa5d6b8f94d2f0065f187b0fc.tar.xz openshift-433e3c77adf99cfaa5d6b8f94d2f0065f187b0fc.zip | |
Merge pull request #190 from jwhonce/wip/containers
Infrastructure - Deploy services in cluster
@twiest All comments covered.
Diffstat (limited to 'roles/openshift_register_nodes')
| -rw-r--r-- | roles/openshift_register_nodes/tasks/main.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_register_nodes/tasks/main.yml b/roles/openshift_register_nodes/tasks/main.yml index d4d72d126..dcb96bbf9 100644 --- a/roles/openshift_register_nodes/tasks/main.yml +++ b/roles/openshift_register_nodes/tasks/main.yml @@ -6,15 +6,15 @@ # TODO: use a template lookup here # TODO: create a failed_when condition -- name: Use enterprise default for openshift_registry_url if not set +- name: Use enterprise default for oreg_url if not set set_fact: - openshift_registry_url: "openshift3_beta/ose-${component}:${version}" - when: openshift.common.deployment_type == 'enterprise' and openshift_registry_url is not defined + oreg_url: "openshift3_beta/ose-${component}:${version}" + when: openshift.common.deployment_type == 'enterprise' and oreg_url is not defined -- name: Use online default for openshift_registry_url if not set +- name: Use online default for oreg_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 + oreg_url: "docker-registry.ops.rhcloud.com/openshift3_beta/ose-${component}:${version}" + when: openshift.common.deployment_type == 'online' and oreg_url is not defined - name: Create node config command: > @@ -30,7 +30,7 @@ --certificate-authority={{ openshift_master_ca_cert }} --signer-serial={{ openshift_master_ca_dir }}/serial.txt --node-client-certificate-authority={{ openshift_master_ca_cert }} - {{ ('--images=' ~ openshift_registry_url) if openshift_registry_url is defined else '' }} + {{ ('--images=' ~ oreg_url) if oreg_url is defined else '' }} --listen=https://0.0.0.0:10250 args: chdir: "{{ openshift_cert_parent_dir }}" |