Skip to content

Commit f2cee8b

Browse files
Merge pull request #219 from stfc/add_cadvisor
Rename role and add CAdvisor
2 parents 60cc6ed + 8793b04 commit f2cee8b

File tree

8 files changed

+44
-7
lines changed

8 files changed

+44
-7
lines changed

chatops_deployment/ansible/configure.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
- name: Configure load balancer
3-
hosts: loadbalancer
3+
hosts: haproxy
44
roles:
5-
- role: loadbalancer
5+
- role: haproxy
66
tags:
7-
- loadbalancer
7+
- haproxy
88

99
- name: Configure ChatOps
1010
hosts: chatops
@@ -13,6 +13,14 @@
1313
tags:
1414
- chatops
1515

16+
- name: Configure CAdvisor
17+
hosts: chatops
18+
remote_user: ubuntu
19+
roles:
20+
- role: cadvisor
21+
tags:
22+
- cadvisor
23+
1624
- name: Set up systemd exporters
1725
hosts: all
1826
roles:
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
- name: Install docker
3+
become: true
4+
ansible.builtin.apt:
5+
name: docker.io
6+
update_cache: true
7+
8+
- name: Add ubuntu to docker group
9+
become: true
10+
ansible.builtin.user:
11+
name: ubuntu
12+
groups: docker
13+
append: true
14+
15+
- name: Reset ssh connection to allow user changes to affect ansible user
16+
ansible.builtin.meta: reset_connection
17+
18+
- name: Start CAsvisor container
19+
community.docker.docker_container:
20+
image: gcr.io/cadvisor/cadvisor
21+
name: cadvisor
22+
pull: always
23+
state: started
24+
ports:
25+
- "8080:8080"
26+
volumes:
27+
- /var/run:/var/run:rw
28+
- /sys:/sys:ro
29+
- /var/lib/docker/:/var/lib/docker:ro

chatops_deployment/ansible/roles/loadbalancer/tasks/certbot.yml renamed to chatops_deployment/ansible/roles/haproxy/tasks/certbot.yml

File renamed without changes.

chatops_deployment/ansible/roles/loadbalancer/tasks/haproxy.yml renamed to chatops_deployment/ansible/roles/haproxy/tasks/haproxy.yml

File renamed without changes.

chatops_deployment/ansible/roles/loadbalancer/tasks/main.yml renamed to chatops_deployment/ansible/roles/haproxy/tasks/main.yml

File renamed without changes.

chatops_deployment/ansible/roles/loadbalancer/templates/haproxy.cfg.j2 renamed to chatops_deployment/ansible/roles/haproxy/templates/haproxy.cfg.j2

File renamed without changes.

chatops_deployment/ansible/roles/terraform/templates/hosts.ini.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{{ ip }}
99
{% endfor %}
1010

11-
[loadbalancer]
11+
[haproxy]
1212
{{ terraform_floating_ip }} ansible_user=ubuntu
1313

1414
[prometheus]

chatops_deployment/terraform/modules/networking/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ resource "openstack_networking_secgroup_rule_v2" "chatops" {
6565
security_group_id = openstack_networking_secgroup_v2.chatops.id
6666
}
6767

68-
resource "openstack_networking_secgroup_rule_v2" "docker_metrics" {
68+
resource "openstack_networking_secgroup_rule_v2" "cadvisor" {
6969
direction = "ingress"
7070
ethertype = "IPv4"
7171
protocol = "tcp"
72-
port_range_min = 9323
73-
port_range_max = 9323
72+
port_range_min = 8080
73+
port_range_max = 8080
7474
remote_ip_prefix = "192.168.100.0/22"
7575
security_group_id = openstack_networking_secgroup_v2.chatops.id
7676
}

0 commit comments

Comments
 (0)