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_master/tasks | |
| 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_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index f9e6199a5..ac96e2b48 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -49,15 +49,15 @@ # TODO: should probably use a template lookup for this # TODO: should allow for setting --etcd, --kubernetes options # TODO: recreate config if values change -- 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 master config command: > @@ -67,7 +67,7 @@ --master={{ openshift.master.api_url }} --public-master={{ openshift.master.public_api_url }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://0.0.0.0:{{ openshift.master.api_port }} - {{ ('--images=' ~ openshift_registry_url) if (openshift_registry_url | default('', true) != '') else '' }} + {{ ('--images=' ~ oreg_url) if (oreg_url | default('', true) != '') else '' }} {{ ('--nodes=' ~ openshift_node_ips | join(',')) if (openshift_node_ips | default('', true) != '') else '' }} args: chdir: "{{ openshift_cert_parent_dir }}" |