From f1aec4727384913d0c0b285c58878d299d5f6bfb Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 23 Mar 2017 17:05:54 -0400 Subject: Specify enterprise defaults for logging and metrics images --- roles/openshift_logging/defaults/main.yml | 2 -- roles/openshift_logging/tasks/main.yaml | 6 ++++++ roles/openshift_logging/vars/default_images.yml | 2 ++ roles/openshift_logging/vars/openshift-enterprise.yml | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 roles/openshift_logging/vars/default_images.yml create mode 100644 roles/openshift_logging/vars/openshift-enterprise.yml (limited to 'roles/openshift_logging') diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 1ea0fbe12..d9c9a83d0 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -1,6 +1,4 @@ --- -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') }}" openshift_logging_use_ops: "{{ openshift_hosted_logging_enable_ops_cluster | default('false') | bool }}" openshift_logging_master_url: "https://kubernetes.default.svc.{{ openshift.common.dns_domain }}" openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':' ~ (openshift_master_api_port | default('8443', true))) }}" diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml index eb60175c7..7ff9c5319 100644 --- a/roles/openshift_logging/tasks/main.yaml +++ b/roles/openshift_logging/tasks/main.yaml @@ -3,6 +3,12 @@ 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: "{{ item }}" + with_first_found: + - "{{ openshift_deployment_type | default(deployment_type) }}.yml" + - "default_images.yml" + - 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 new file mode 100644 index 000000000..139f600c5 --- /dev/null +++ b/roles/openshift_logging/vars/default_images.yml @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..f30e40947 --- /dev/null +++ b/roles/openshift_logging/vars/openshift-enterprise.yml @@ -0,0 +1,2 @@ +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(openshift_release | default ('3.5.0') ) }}" -- cgit v1.2.3 From c8afa7e4548e8c1baaeaf4bea3220a20ff71b7b9 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 23 Mar 2017 17:32:17 -0400 Subject: Make linter happy --- roles/openshift_logging/vars/default_images.yml | 1 + roles/openshift_logging/vars/openshift-enterprise.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'roles/openshift_logging') diff --git a/roles/openshift_logging/vars/default_images.yml b/roles/openshift_logging/vars/default_images.yml index 139f600c5..45f37bfd1 100644 --- a/roles/openshift_logging/vars/default_images.yml +++ b/roles/openshift_logging/vars/default_images.yml @@ -1,2 +1,3 @@ +--- 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 index f30e40947..4009b0690 100644 --- a/roles/openshift_logging/vars/openshift-enterprise.yml +++ b/roles/openshift_logging/vars/openshift-enterprise.yml @@ -1,2 +1,3 @@ +--- 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(openshift_release | default ('3.5.0') ) }}" -- cgit v1.2.3 From 22d8eccb74bd2a1da5c29c0020f1f7ba89164cdc Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 24 Mar 2017 11:17:44 -0400 Subject: Fix overriding openshift_{logging,metrics}_image_prefix --- roles/openshift_logging/tasks/main.yaml | 5 +++++ roles/openshift_logging/vars/default_images.yml | 4 ++-- roles/openshift_logging/vars/openshift-enterprise.yml | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'roles/openshift_logging') diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml index 7ff9c5319..c7f4a2f93 100644 --- a/roles/openshift_logging/tasks/main.yaml +++ b/roles/openshift_logging/tasks/main.yaml @@ -9,6 +9,11 @@ - "{{ openshift_deployment_type | default(deployment_type) }}.yml" - "default_images.yml" +- 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 index 45f37bfd1..1a77808f6 100644 --- a/roles/openshift_logging/vars/default_images.yml +++ b/roles/openshift_logging/vars/default_images.yml @@ -1,3 +1,3 @@ --- -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') }}" +__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 index 4009b0690..9679d209a 100644 --- a/roles/openshift_logging/vars/openshift-enterprise.yml +++ b/roles/openshift_logging/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- -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(openshift_release | default ('3.5.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(openshift_release | default ('3.5.0') ) }}" -- cgit v1.2.3