diff options
Diffstat (limited to 'roles')
17 files changed, 23 insertions, 23 deletions
diff --git a/roles/ansible_service_broker/vars/openshift-enterprise.yml b/roles/ansible_service_broker/vars/openshift-enterprise.yml index c203f596e..15a7e5477 100644 --- a/roles/ansible_service_broker/vars/openshift-enterprise.yml +++ b/roles/ansible_service_broker/vars/openshift-enterprise.yml @@ -1,7 +1,7 @@ --- __ansible_service_broker_image_prefix: registry.access.redhat.com/openshift3/ose- -__ansible_service_broker_image_tag: v3.7 +__ansible_service_broker_image_tag: "{{ openshift_image_tag }}" __ansible_service_broker_etcd_image_prefix: registry.access.redhat.com/rhel7/ __ansible_service_broker_etcd_image_tag: latest @@ -14,6 +14,6 @@ __ansible_service_broker_registry_url: "https://registry.access.redhat.com" __ansible_service_broker_registry_user: null __ansible_service_broker_registry_password: null __ansible_service_broker_registry_organization: null -__ansible_service_broker_registry_tag: v3.7 +__ansible_service_broker_registry_tag: "{{ openshift_image_tag }}" __ansible_service_broker_registry_whitelist: - '.*-apb$' diff --git a/roles/openshift_logging_curator/vars/default_images.yml b/roles/openshift_logging_curator/vars/default_images.yml index 208b41afa..503be9b58 100644 --- a/roles/openshift_logging_curator/vars/default_images.yml +++ b/roles/openshift_logging_curator/vars/default_images.yml @@ -1,3 +1,3 @@ --- __openshift_logging_curator_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') }}" -__openshift_logging_curator_image_version: "{{ openshift_logging_image_version | default('latest') }}" +__openshift_logging_curator_image_version: "{{ openshift_logging_image_version | default(openshift_image_tag) }}" diff --git a/roles/openshift_logging_curator/vars/openshift-enterprise.yml b/roles/openshift_logging_curator/vars/openshift-enterprise.yml index 79cf131fd..e0507fe3c 100644 --- a/roles/openshift_logging_curator/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_curator/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- __openshift_logging_curator_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_curator_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_curator_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" diff --git a/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml b/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml index 07d92896f..0cf48a66b 100644 --- a/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_elasticsearch/vars/openshift-enterprise.yml @@ -1,5 +1,5 @@ --- __openshift_logging_elasticsearch_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_elasticsearch_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_elasticsearch_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" __openshift_logging_elasticsearch_proxy_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_elasticsearch_proxy_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_elasticsearch_proxy_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" diff --git a/roles/openshift_logging_eventrouter/vars/openshift-enterprise.yml b/roles/openshift_logging_eventrouter/vars/openshift-enterprise.yml index bb7dc6455..1a6bc208e 100644 --- a/roles/openshift_logging_eventrouter/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_eventrouter/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- __openshift_logging_eventrouter_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_eventrouter_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_eventrouter_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" diff --git a/roles/openshift_logging_fluentd/vars/openshift-enterprise.yml b/roles/openshift_logging_fluentd/vars/openshift-enterprise.yml index d0c74f1fb..b62b62a74 100644 --- a/roles/openshift_logging_fluentd/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_fluentd/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- __openshift_logging_fluentd_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_fluentd_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_fluentd_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" diff --git a/roles/openshift_logging_kibana/vars/openshift-enterprise.yml b/roles/openshift_logging_kibana/vars/openshift-enterprise.yml index 0be2e7252..033c8ae5f 100644 --- a/roles/openshift_logging_kibana/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_kibana/vars/openshift-enterprise.yml @@ -1,5 +1,5 @@ --- __openshift_logging_kibana_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_kibana_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_kibana_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" __openshift_logging_kibana_proxy_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_kibana_proxy_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_kibana_proxy_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" diff --git a/roles/openshift_logging_mux/vars/openshift-enterprise.yml b/roles/openshift_logging_mux/vars/openshift-enterprise.yml index 1e7eb9d8d..a72459748 100644 --- a/roles/openshift_logging_mux/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_mux/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- __openshift_logging_mux_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_mux_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_mux_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" diff --git a/roles/openshift_metrics/vars/default_images.yml b/roles/openshift_metrics/vars/default_images.yml index 8704ddfa0..e7003db76 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: "docker.io/openshift/origin-" -__openshift_metrics_image_version: "latest" +__openshift_metrics_image_version: "{{ openshift_image_tag }}" diff --git a/roles/openshift_metrics/vars/openshift-enterprise.yml b/roles/openshift_metrics/vars/openshift-enterprise.yml index 5a1728de5..b3b3552b7 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: "registry.access.redhat.com/openshift3/" -__openshift_metrics_image_version: "v3.7" +__openshift_metrics_image_version: "{{ openshift_image_tag }}" diff --git a/roles/openshift_prometheus/vars/openshift-enterprise.yml b/roles/openshift_prometheus/vars/openshift-enterprise.yml index 9bb4c99bb..02319867d 100644 --- a/roles/openshift_prometheus/vars/openshift-enterprise.yml +++ b/roles/openshift_prometheus/vars/openshift-enterprise.yml @@ -6,7 +6,7 @@ l_openshift_prometheus_alertmanager_image_prefix: "{{ openshift_prometheus_alter l_openshift_prometheus_alertbuffer_image_prefix: "{{ openshift_prometheus_alertbuffer_image_prefix | default(l_openshift_prometheus_image_prefix) }}" # image version defaults -l_openshift_prometheus_image_version: "{{ openshift_prometheus_image_version | default('v3.7') }}" -l_openshift_prometheus_proxy_image_version: "{{ openshift_prometheus_proxy_image_version | default('v3.7') }}" -l_openshift_prometheus_alertmanager_image_version: "{{ openshift_prometheus_alertmanager_image_version | default('v3.7') }}" -l_openshift_prometheus_alertbuffer_image_version: "{{ openshift_prometheus_alertbuffer_image_version | default('v3.7') }}" +l_openshift_prometheus_image_version: "{{ openshift_prometheus_image_version | default(openshift_image_tag) }}" +l_openshift_prometheus_proxy_image_version: "{{ openshift_prometheus_proxy_image_version | default(openshift_image_tag) }}" +l_openshift_prometheus_alertmanager_image_version: "{{ openshift_prometheus_alertmanager_image_version | default(openshift_image_tag) }}" +l_openshift_prometheus_alertbuffer_image_version: "{{ openshift_prometheus_alertbuffer_image_version | default(openshift_image_tag) }}" diff --git a/roles/openshift_service_catalog/vars/default_images.yml b/roles/openshift_service_catalog/vars/default_images.yml index 6fb9d1b86..b3bb16f18 100644 --- a/roles/openshift_service_catalog/vars/default_images.yml +++ b/roles/openshift_service_catalog/vars/default_images.yml @@ -1,3 +1,3 @@ --- __openshift_service_catalog_image_prefix: "docker.io/openshift/origin-" -__openshift_service_catalog_image_version: "latest" +__openshift_service_catalog_image_version: "{{ openshift_service_catalog_image_version | default(openshift_image_tag) }}" diff --git a/roles/openshift_service_catalog/vars/openshift-enterprise.yml b/roles/openshift_service_catalog/vars/openshift-enterprise.yml index cab9cc7d8..7f56292a2 100644 --- a/roles/openshift_service_catalog/vars/openshift-enterprise.yml +++ b/roles/openshift_service_catalog/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- __openshift_service_catalog_image_prefix: "registry.access.redhat.com/openshift3/ose-" -__openshift_service_catalog_image_version: "v3.7" +__openshift_service_catalog_image_version: "{{ openshift_service_catalog_image_version | default(openshift_image_tag) }}" diff --git a/roles/openshift_web_console/vars/default_images.yml b/roles/openshift_web_console/vars/default_images.yml index 42d331ac5..0bd4e981d 100644 --- a/roles/openshift_web_console/vars/default_images.yml +++ b/roles/openshift_web_console/vars/default_images.yml @@ -1,4 +1,4 @@ --- __openshift_web_console_prefix: "docker.io/openshift/origin-" -__openshift_web_console_version: "latest" +__openshift_web_console_version: "{{ openshift_image_tag }}" __openshift_web_console_image_name: "web-console" diff --git a/roles/openshift_web_console/vars/openshift-enterprise.yml b/roles/openshift_web_console/vars/openshift-enterprise.yml index 375c22067..fd5e4e9a0 100644 --- a/roles/openshift_web_console/vars/openshift-enterprise.yml +++ b/roles/openshift_web_console/vars/openshift-enterprise.yml @@ -1,4 +1,4 @@ --- __openshift_web_console_prefix: "registry.access.redhat.com/openshift3/ose-" -__openshift_web_console_version: "v3.9" +__openshift_web_console_version: "{{ openshift_image_tag }}" __openshift_web_console_image_name: "web-console" diff --git a/roles/template_service_broker/vars/default_images.yml b/roles/template_service_broker/vars/default_images.yml index dc164a4db..b99f52bbb 100644 --- a/roles/template_service_broker/vars/default_images.yml +++ b/roles/template_service_broker/vars/default_images.yml @@ -1,4 +1,4 @@ --- __template_service_broker_prefix: "docker.io/openshift/origin-" -__template_service_broker_version: "latest" +__template_service_broker_version: "{{ openshift_image_tag }}" __template_service_broker_image_name: "template-service-broker" diff --git a/roles/template_service_broker/vars/openshift-enterprise.yml b/roles/template_service_broker/vars/openshift-enterprise.yml index b65b97691..4bc3795bd 100644 --- a/roles/template_service_broker/vars/openshift-enterprise.yml +++ b/roles/template_service_broker/vars/openshift-enterprise.yml @@ -1,4 +1,4 @@ --- __template_service_broker_prefix: "registry.access.redhat.com/openshift3/ose-" -__template_service_broker_version: "v3.7" +__template_service_broker_version: "{{ openshift_image_tag }}" __template_service_broker_image_name: "template-service-broker" |