From 3f8acefbe197fb41e1ae407e0de6c6064842b34f Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 4 Mar 2022 12:31:47 -0800 Subject: [PATCH] Run zuul-web on zuul01 and add to load balancer Change-Id: Ia8b10338fa3a1876993404276e0759f4b10d6b54 --- inventory/service/group_vars/zuul-lb.yaml | 6 ++++++ playbooks/zuul_start.yaml | 5 ++++- playbooks/zuul_stop.yaml | 5 ++++- zuul.d/infra-prod.yaml | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/inventory/service/group_vars/zuul-lb.yaml b/inventory/service/group_vars/zuul-lb.yaml index 444b6113fa..4ad612cc80 100644 --- a/inventory/service/group_vars/zuul-lb.yaml +++ b/inventory/service/group_vars/zuul-lb.yaml @@ -3,18 +3,24 @@ zuul_lb_listeners: bind: - ':::80' servers: + - name: 'zuul01.opendev.org' + address: '104.130.246.57:80' - name: 'zuul02.opendev.org' address: '104.130.246.31:80' - name: balance_zuul_https bind: - ':::443' servers: + - name: 'zuul01.opendev.org' + address: '104.130.246.57:443' - name: 'zuul02.opendev.org' address: '104.130.246.31:443' - name: balance_zuul_finger bind: - ':::79' servers: + - name: 'zuul01.opendev.org' + address: '104.130.246.57:79' - name: 'zuul02.opendev.org' address: '104.130.246.31:79' iptables_extra_public_tcp_ports: diff --git a/playbooks/zuul_start.yaml b/playbooks/zuul_start.yaml index 4426ce6185..a295778b7c 100644 --- a/playbooks/zuul_start.yaml +++ b/playbooks/zuul_start.yaml @@ -1,10 +1,13 @@ # Run this with "-f 20" -- hosts: 'zuul02.opendev.org:!disabled' +- hosts: 'zuul-scheduler:!disabled' tasks: - include_role: name: zuul-scheduler tasks_from: start + +- hosts: 'zuul-web:!disabled' + tasks: - include_role: name: zuul-web tasks_from: start diff --git a/playbooks/zuul_stop.yaml b/playbooks/zuul_stop.yaml index d8c12c8de3..6f53fdaf79 100644 --- a/playbooks/zuul_stop.yaml +++ b/playbooks/zuul_stop.yaml @@ -1,11 +1,14 @@ # Run this with "-f 20" -- hosts: 'zuul02.opendev.org:!disabled' +- hosts: 'zuul-scheduler:!disabled' any_errors_fatal: true tasks: - include_role: name: zuul-scheduler tasks_from: stop + +- hosts: 'zuul-web:!disabled' + tasks: - include_role: name: zuul-web tasks_from: stop diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml index 8bc47d7158..c8521297fa 100644 --- a/zuul.d/infra-prod.yaml +++ b/zuul.d/infra-prod.yaml @@ -379,7 +379,7 @@ - inventory/service/group_vars/zuul - inventory/service/group_vars/zookeeper.yaml - inventory/service/host_vars/zk\d+ - - inventory/service/host_vars/zuul02.opendev.org + - inventory/service/host_vars/zuul\d+.opendev.org - playbooks/roles/install-docker/ - playbooks/roles/iptables/ - playbooks/roles/zookeeper/