Commit 55588e27 authored by Ana Aviles's avatar Ana Aviles

Merge branch '488-use-coredns-on-oas-cluster-node' into 'master'

Resolve "Use coredns on OAS cluster node"

Closes #488

See merge request !226
parents 449f735d 35f6b142
.DEFAULT_GOAL := help
help:
# See Makefile for available targets.
freeze:
# pip wrongly adds `pkg-resources==0.0.0` which will break some systems, see
# https://open.greenhost.net/openappstack/openappstack/issues/498#note_15057
pip3 freeze | grep -v "pkg-resources" > requirements-stable.txt
......@@ -61,6 +61,9 @@
name: local-flux
tags: ['flux']
when: local_flux
- import_role:
name: additional_config
tags: ['additional']
always:
- import_role:
name: finalize
......
This role configures the cluster after app installation has started via
flux.
All resources that are not needed for flux should go here, so we save time by
starting the flux install process early in the background.
---
- name: Use core-dns service for system resolver
tags:
- dns
- core-dns
lineinfile:
path: /etc/resolv.conf
insertbefore: BOF
line: nameserver 10.43.0.10
---
- name: Logrotate config for OAS logs
copy:
src: etc/logrotate.d/OpenAppStack
dest: /etc/logrotate.d/
mode: '0644'
---
- import_tasks: logging.yml
- import_tasks: dns.yml
......@@ -31,12 +31,6 @@
- python3-wheel
- python3-psutil
- name: Logrotate config for OAS logs
copy:
src: etc/logrotate.d/OpenAppStack
dest: /etc/logrotate.d/
mode: '0644'
- name: Install python packages via pip3
tags:
- package
......
......@@ -14,11 +14,8 @@ def test_prometheus_alerts(host):
print("Starting prometheus test...")
prometheus_ip = host.check_output(
'dig +short '
'monitoring-prometheus-oper-prometheus.oas.svc.cluster.local '
'@10.43.0.10')
url = 'http://{0}:9090/api/v1/alerts'.format(prometheus_ip)
url = 'http://monitoring-prometheus-oper-prometheus.oas.svc.cluster.local:9090/api/v1/alerts'
alert_json = json.loads(host.check_output('curl ' + url))
status = alert_json["status"]
alerts = alert_json["data"]["alerts"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment