diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-23 17:05:54 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-03-24 14:57:00 -0400 |
| commit | f1aec4727384913d0c0b285c58878d299d5f6bfb (patch) | |
| tree | 2edb7bf8d691c68e3502d8e23908e12dfeca55a7 /roles/openshift_metrics | |
| parent | 86d56d1aabdff4a4d828a3f22099640f9769f9f4 (diff) | |
| download | openshift-f1aec4727384913d0c0b285c58878d299d5f6bfb.tar.gz openshift-f1aec4727384913d0c0b285c58878d299d5f6bfb.tar.bz2 openshift-f1aec4727384913d0c0b285c58878d299d5f6bfb.tar.xz openshift-f1aec4727384913d0c0b285c58878d299d5f6bfb.zip | |
Specify enterprise defaults for logging and metrics images
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 7 | ||||
| -rw-r--r-- | roles/openshift_metrics/vars/default_images.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/vars/openshift-enterprise.yml | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index 5921b7bb7..1d3db8a1a 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -1,8 +1,6 @@ --- openshift_metrics_start_cluster: True openshift_metrics_install_metrics: True -openshift_metrics_image_prefix: docker.io/openshift/origin- -openshift_metrics_image_version: latest openshift_metrics_startup_timeout: 500 openshift_metrics_hawkular_replicas: 1 diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index 1eebff3bf..f02906bc5 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -1,4 +1,11 @@ --- + +- name: Set default image variables based on deployment_type + include_vars: "{{ item }}" + with_first_found: + - "{{ openshift_deployment_type | default(deployment_type) }}.yml" + - "default_images.yml" + - 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 new file mode 100644 index 000000000..9c1255dd7 --- /dev/null +++ b/roles/openshift_metrics/vars/default_images.yml @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..6b9b644e5 --- /dev/null +++ b/roles/openshift_metrics/vars/openshift-enterprise.yml @@ -0,0 +1,2 @@ +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') ) }}" |