Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kolla Ansible
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Very Demiurge Very Mindful
Kolla Ansible
Commits
31a96e4f
Commit
31a96e4f
authored
8 years ago
by
Jenkins
Committed by
Gerrit Code Review
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Fix genconfig for kolla-kubernetes"
parents
04440b19
cac3ed85
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ansible/roles/common/templates/conf/input/01-syslog.conf.j2
+4
-0
4 additions, 0 deletions
ansible/roles/common/templates/conf/input/01-syslog.conf.j2
ansible/roles/haproxy/templates/haproxy.cfg.j2
+2
-0
2 additions, 0 deletions
ansible/roles/haproxy/templates/haproxy.cfg.j2
with
6 additions
and
0 deletions
ansible/roles/common/templates/conf/input/01-syslog.conf.j2
+
4
−
0
View file @
31a96e4f
<source>
<source>
@type syslog
@type syslog
port {{ fluentd_syslog_port }}
port {{ fluentd_syslog_port }}
{% if orchestration_engine != 'KUBERNETES' %}
bind {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
bind {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
{% else %}
bind 0.0.0.0
{% endif %}
tag syslog
tag syslog
format /^(?<Payload>.*)$/
format /^(?<Payload>.*)$/
</source>
</source>
This diff is collapsed.
Click to expand it.
ansible/roles/haproxy/templates/haproxy.cfg.j2
+
2
−
0
View file @
31a96e4f
...
@@ -4,7 +4,9 @@ global
...
@@ -4,7 +4,9 @@ global
user haproxy
user haproxy
group haproxy
group haproxy
daemon
daemon
{% if orchestration_engine != 'KUBERNETES' %}
log {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ fluentd_syslog_port }} local1
log {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ fluentd_syslog_port }} local1
{% endif %}
maxconn 4000
maxconn 4000
stats socket /var/lib/kolla/haproxy/haproxy.sock
stats socket /var/lib/kolla/haproxy/haproxy.sock
{% if kolla_enable_tls_external | bool %}
{% if kolla_enable_tls_external | bool %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment