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_logging | |
| 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_logging')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/main.yaml | 6 | ||||
| -rw-r--r-- | roles/openshift_logging/vars/default_images.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/vars/openshift-enterprise.yml | 2 |
4 files changed, 10 insertions, 2 deletions
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') ) }}" |