diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-19 13:53:08 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-08-24 16:02:49 -0400 |
| commit | 6765f1f398c1a3b8d72e1a07085c953f5a1ad810 (patch) | |
| tree | 6789321fbbb6a873a5afe59c594594b1a9897169 /roles | |
| parent | 7999e06a0ea70fb9e7967fd14bf4a96748b3b4da (diff) | |
| download | openshift-6765f1f398c1a3b8d72e1a07085c953f5a1ad810.tar.gz openshift-6765f1f398c1a3b8d72e1a07085c953f5a1ad810.tar.bz2 openshift-6765f1f398c1a3b8d72e1a07085c953f5a1ad810.tar.xz openshift-6765f1f398c1a3b8d72e1a07085c953f5a1ad810.zip | |
Rely on IMAGE_PREFIX and IMAGE_VERSION defaults from the templates themselves
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index bd8010705..ff4d9c946 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1784,8 +1784,6 @@ class OpenShiftFacts(object): defaults['hosted'] = dict( metrics=dict( deploy=False, - deployer_prefix='registry.access.redhat.com/openshift3/', - deployer_version='3.3.0', duration=7, resolution='10s', storage=dict( diff --git a/roles/openshift_metrics/tasks/install.yml b/roles/openshift_metrics/tasks/install.yml index 1f30e292b..2fbb7d606 100644 --- a/roles/openshift_metrics/tasks/install.yml +++ b/roles/openshift_metrics/tasks/install.yml @@ -71,7 +71,7 @@ set_fact: deployer_cmd: "{{ openshift.common.client_binary }} process -f \ {{ metrics_template_dir }}/metrics-deployer.yaml -v \ - HAWKULAR_METRICS_HOSTNAME={{ metrics_hostname }},USE_PERSISTENT_STORAGE={{metrics_persistence | string | lower }},METRIC_DURATION={{ openshift.hosted.metrics.duration }},METRIC_RESOLUTION={{ openshift.hosted.metrics.resolution }},IMAGE_PREFIX={{ openshift.hosted.metrics.deployer_prefix }},IMAGE_VERSION={{ openshift.hosted.metrics.deployer_version }},MODE={{ deployment_mode }} \ + HAWKULAR_METRICS_HOSTNAME={{ metrics_hostname }},USE_PERSISTENT_STORAGE={{metrics_persistence | string | lower }},METRIC_DURATION={{ openshift.hosted.metrics.duration }},METRIC_RESOLUTION={{ openshift.hosted.metrics.resolution }}{{ image_prefix }}{{ image_version }},MODE={{ deployment_mode }} \ | {{ openshift.common.client_binary }} --namespace openshift-infra \ --config={{ openshift_metrics_kubeconfig }} \ create -f -" diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index b20cd4b0e..8a6712468 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -39,6 +39,8 @@ metrics_template_dir: "/usr/share/openshift/examples/infrastructure-templates/{{ 'origin' if deployment_type == 'origin' else 'enterprise' }}" cassandra_nodes: "{{ ',CASSANDRA_NODES=' ~ openshift.hosted.metrics.cassandra_nodes if 'cassandra' in openshift.hosted.metrics else '' }}" cassandra_pv_size: "{{ ',CASSANDRA_PV_SIZE=' ~ openshift.hosted.metrics.storage_volume_size if openshift.hosted.metrics.storage_volume_size | default(none) is not none else '' }}" + image_prefix: "{{ ',IMAGE_PREFIX=' ~ openshift.hosted.metrics.deployer_prefix if 'deployer_prefix' in openshift.hosted.metrics else '' }}" + image_version: "{{ ',IMAGE_VERSION=' ~ openshift.hosted.metrics.deployer_version if 'deployer_version' in openshift.hosted.metrics else '' }}" - name: Check for existing metrics pods |