diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-13 13:46:19 -0600 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-13 13:46:19 -0600 |
| commit | aea3fa16ecf72ea5657fa95d96558a7ebde9f66e (patch) | |
| tree | dfdaf1c95d5121808399e82b623cc9344fcbb033 | |
| parent | 2958e5dbed2fe9d17cb099ac77e72d02ac0d497b (diff) | |
| download | openshift-aea3fa16ecf72ea5657fa95d96558a7ebde9f66e.tar.gz openshift-aea3fa16ecf72ea5657fa95d96558a7ebde9f66e.tar.bz2 openshift-aea3fa16ecf72ea5657fa95d96558a7ebde9f66e.tar.xz openshift-aea3fa16ecf72ea5657fa95d96558a7ebde9f66e.zip | |
Removing setting prefix and version facts in openshift_logging to let the component roles set their defaults
| -rw-r--r-- | roles/openshift_logging/tasks/main.yaml | 13 | ||||
| -rw-r--r-- | roles/openshift_logging/vars/default_images.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_logging/vars/openshift-enterprise.yml | 3 |
3 files changed, 0 insertions, 19 deletions
diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml index 2e32c29d3..7f8e88036 100644 --- a/roles/openshift_logging/tasks/main.yaml +++ b/roles/openshift_logging/tasks/main.yaml @@ -3,19 +3,6 @@ msg: Only one Fluentd nodeselector key pair should be provided when: openshift_logging_fluentd_nodeselector.keys() | count > 1 -- name: Set default image variables based on deployment_type - include_vars: "{{ var_file_name }}" - with_first_found: - - "{{ openshift_deployment_type | default(deployment_type) }}.yml" - - "default_images.yml" - loop_control: - loop_var: var_file_name - -- name: Set logging image facts - set_fact: - openshift_logging_image_prefix: "{{ openshift_logging_image_prefix | default(__openshift_logging_image_prefix) }}" - openshift_logging_image_version: "{{ openshift_logging_image_version | default(__openshift_logging_image_version) }}" - - name: Create temp directory for doing work in command: mktemp -d /tmp/openshift-logging-ansible-XXXXXX register: mktemp diff --git a/roles/openshift_logging/vars/default_images.yml b/roles/openshift_logging/vars/default_images.yml deleted file mode 100644 index 1a77808f6..000000000 --- a/roles/openshift_logging/vars/default_images.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -__openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('docker.io/openshift/origin-') }}" -__openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default('latest') }}" diff --git a/roles/openshift_logging/vars/openshift-enterprise.yml b/roles/openshift_logging/vars/openshift-enterprise.yml deleted file mode 100644 index f60fa8d7d..000000000 --- a/roles/openshift_logging/vars/openshift-enterprise.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -__openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default ('v3.7') }}" |