diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-24 11:17:44 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-03-24 14:58:20 -0400 |
| commit | 22d8eccb74bd2a1da5c29c0020f1f7ba89164cdc (patch) | |
| tree | 02473ce2c220495ad53b01cde1cf7b866fbf1981 /roles/openshift_metrics | |
| parent | c8afa7e4548e8c1baaeaf4bea3220a20ff71b7b9 (diff) | |
| download | openshift-22d8eccb74bd2a1da5c29c0020f1f7ba89164cdc.tar.gz openshift-22d8eccb74bd2a1da5c29c0020f1f7ba89164cdc.tar.bz2 openshift-22d8eccb74bd2a1da5c29c0020f1f7ba89164cdc.tar.xz openshift-22d8eccb74bd2a1da5c29c0020f1f7ba89164cdc.zip | |
Fix overriding openshift_{logging,metrics}_image_prefix
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 5 | ||||
| -rw-r--r-- | roles/openshift_metrics/vars/default_images.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_metrics/vars/openshift-enterprise.yml | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index f02906bc5..c8d222c60 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -6,6 +6,11 @@ - "{{ openshift_deployment_type | default(deployment_type) }}.yml" - "default_images.yml" +- name: Set metrics image facts + set_fact: + openshift_metrics_image_prefix: "{{ openshift_metrics_image_prefix | default(__openshift_metrics_image_prefix) }}" + openshift_metrics_image_version: "{{ openshift_metrics_image_version | default(__openshift_metrics_image_version) }}" + - name: Create temp directory for doing work in on target command: mktemp -td openshift-metrics-ansible-XXXXXX register: mktemp diff --git a/roles/openshift_metrics/vars/default_images.yml b/roles/openshift_metrics/vars/default_images.yml index 7e0bdb877..678c4104c 100644 --- a/roles/openshift_metrics/vars/default_images.yml +++ b/roles/openshift_metrics/vars/default_images.yml @@ -1,3 +1,3 @@ --- -openshift_metrics_image_prefix: "{{ openshift_hosted_metrics_deployer_prefix | default('docker.io/openshift/origin-') }}" -openshift_metrics_image_version: "{{ openshift_hosted_metrics_deployer_version | default('latest') }}" +__openshift_metrics_image_prefix: "{{ openshift_hosted_metrics_deployer_prefix | default('docker.io/openshift/origin-') }}" +__openshift_metrics_image_version: "{{ openshift_hosted_metrics_deployer_version | default('latest') }}" diff --git a/roles/openshift_metrics/vars/openshift-enterprise.yml b/roles/openshift_metrics/vars/openshift-enterprise.yml index 9d5d84d15..f28c3ce48 100644 --- a/roles/openshift_metrics/vars/openshift-enterprise.yml +++ b/roles/openshift_metrics/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- -openshift_metrics_image_prefix: "{{ openshift_hosted_metrics_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}" -openshift_metrics_image_version: "{{ openshift_hosted_metrics_deployer_version | default(openshift_release | default ('3.5.0') ) }}" +__openshift_metrics_image_prefix: "{{ openshift_hosted_metrics_deployer_prefix | default('registry.access.redhat.com/openshift3/') }}" +__openshift_metrics_image_version: "{{ openshift_hosted_metrics_deployer_version | default(openshift_release | default ('3.5.0') ) }}" |