diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-03 15:57:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 15:57:59 -0400 |
| commit | 52d46f65d381bd12590d608c3185b4ce2dd9885f (patch) | |
| tree | 26e664cacac055132c38fe0887bf2677f3930fbc | |
| parent | ffb9854b1245120b571f637f072fac967082ed40 (diff) | |
| parent | eb30b12657093cac889774479402f6fc42ed65ae (diff) | |
| download | openshift-52d46f65d381bd12590d608c3185b4ce2dd9885f.tar.gz openshift-52d46f65d381bd12590d608c3185b4ce2dd9885f.tar.bz2 openshift-52d46f65d381bd12590d608c3185b4ce2dd9885f.tar.xz openshift-52d46f65d381bd12590d608c3185b4ce2dd9885f.zip | |
Merge pull request #4656 from jcantrill/bz1466680_fix_alt_log_namespace
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 221a81340..50698599a 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -65,6 +65,7 @@ name: openshift_logging_elasticsearch vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" + openshift_logging_elasticsearch_namespace: "{{ openshift_logging_namespace }}" openshift_logging_elasticsearch_deployment_name: "{{ item.0 }}" openshift_logging_elasticsearch_pvc_name: "{{ openshift_logging_es_pvc_prefix ~ '-' ~ item.2 if item.1 is none else item.1 }}" openshift_logging_elasticsearch_replica_count: "{{ openshift_logging_es_cluster_size | int }}" @@ -86,6 +87,7 @@ name: openshift_logging_elasticsearch vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" + openshift_logging_elasticsearch_namespace: "{{ openshift_logging_namespace }}" openshift_logging_elasticsearch_pvc_name: "{{ openshift_logging_es_pvc_prefix }}-{{ item | int + openshift_logging_facts.elasticsearch.deploymentconfigs | count - 1 }}" openshift_logging_elasticsearch_replica_count: "{{ openshift_logging_es_cluster_size | int }}" @@ -112,6 +114,7 @@ name: openshift_logging_elasticsearch vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" + openshift_logging_elasticsearch_namespace: "{{ openshift_logging_namespace }}" openshift_logging_elasticsearch_deployment_name: "{{ item.0 }}" openshift_logging_elasticsearch_pvc_name: "{{ openshift_logging_es_ops_pvc_prefix ~ '-' ~ item.2 if item.1 is none else item.1 }}" openshift_logging_elasticsearch_ops_deployment: true @@ -141,6 +144,7 @@ name: openshift_logging_elasticsearch vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" + openshift_logging_elasticsearch_namespace: "{{ openshift_logging_namespace }}" openshift_logging_elasticsearch_pvc_name: "{{ openshift_logging_es_ops_pvc_prefix }}-{{ item | int + openshift_logging_facts.elasticsearch_ops.deploymentconfigs | count - 1 }}" openshift_logging_elasticsearch_ops_deployment: true openshift_logging_elasticsearch_replica_count: "{{ openshift_logging_es_ops_cluster_size | int }}" |