diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-06-01 15:49:06 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-06-01 15:49:06 -0700 |
| commit | 28c279382f0b5d7570e10a8c56ffffbb6666ed2d (patch) | |
| tree | a51cfd7350372b41b25ae2e8986ad464360ba508 /roles/openshift_master | |
| parent | 5ecbe78c384a134620180a0a6e10a997acf4005e (diff) | |
| download | openshift-28c279382f0b5d7570e10a8c56ffffbb6666ed2d.tar.gz openshift-28c279382f0b5d7570e10a8c56ffffbb6666ed2d.tar.bz2 openshift-28c279382f0b5d7570e10a8c56ffffbb6666ed2d.tar.xz openshift-28c279382f0b5d7570e10a8c56ffffbb6666ed2d.zip | |
* rename openshift_registry_url oreg_url
* rename option_images to _{oreg|ortr}_images
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/README.md | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/roles/openshift_master/README.md b/roles/openshift_master/README.md index 9f9d0a613..cc5b06964 100644 --- a/roles/openshift_master/README.md +++ b/roles/openshift_master/README.md @@ -17,7 +17,7 @@ From this role: |-------------------------------------|-----------------------|--------------------------------------------------| | openshift_master_debug_level | openshift_debug_level | Verbosity of the debug logs for openshift-master | | openshift_node_ips | [] | List of the openshift node ip addresses to pre-register when openshift-master starts up | -| openshift_registry_url | UNDEF | Default docker registry to use | +| oreg_url | UNDEF | Default docker registry to use | | openshift_master_api_port | UNDEF | | | openshift_master_console_port | UNDEF | | | openshift_master_api_url | UNDEF | | 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 }}" |