opendev/system-config
Code Issues Proposed changes

Merge "Deploy codesearch02"

Browse Source
This commit is contained in:
Zuul
2025-02-13 23:55:57 +00:00
committed by Gerrit Code Review
parent 883024ced8 c54721bb44
commit d00620f04b
9 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@@ -14,6 +14,7 @@ cacti_hosts:
- bridge01.opendev.org - bridge01.opendev.org
- cacti.openstack.org - cacti.openstack.org
- codesearch01.opendev.org - codesearch01.opendev.org
- codesearch02.opendev.org
- eavesdrop01.opendev.org - eavesdrop01.opendev.org
- etherpad02.opendev.org - etherpad02.opendev.org
- gitea-lb02.opendev.org - gitea-lb02.opendev.org

11
inventory/base/hosts.yaml
View File

@@ -132,6 +132,17 @@ all:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbItLkYVUXyIBjF0/uTmwjN30vAa93ehprhSfurnoDs5J4LhCb2a6c91xlK8LYjsEvS1Dsz35JSonb2T11zGHuRMvgWt8kgUew6PhiLdsTPqGarosyNCp0DHAzZyjItpOsq9Hd8EHzjO5sm7h+W8HdTnBC1V2JbDe1/6ZxrA80l5P3lg57d27Pq40FN52jAsrNkEmyGp9k+udg4wgKQ84iF8s/ltZRYS4g1sYIb2j4UiWnrPYyiZjFmeNAk5UmK3CYj1Nw9C1GQV8tw8vtzLdsA7U7e77+SlkeJ8Pq3aAKU+axk3tEEbwEBqVnsRJcV61V6EavWaFOAF6M+6mDp0ZlmEzflr2P26XpJkfZFqlHsoR/KOjR3zsWN/eeAeWYdEJm9sup5D6JASt4uMsota6MKnjyV5olvd3S0hOVyYX/+7zYWnO3MDgJt8FBuIbkzuOYrb1wu/nGfBgffQXMayc71s5Z6TYsTpNn7fVBzRoAoY87KHgX1CtZbU0zzFWREkE=' - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbItLkYVUXyIBjF0/uTmwjN30vAa93ehprhSfurnoDs5J4LhCb2a6c91xlK8LYjsEvS1Dsz35JSonb2T11zGHuRMvgWt8kgUew6PhiLdsTPqGarosyNCp0DHAzZyjItpOsq9Hd8EHzjO5sm7h+W8HdTnBC1V2JbDe1/6ZxrA80l5P3lg57d27Pq40FN52jAsrNkEmyGp9k+udg4wgKQ84iF8s/ltZRYS4g1sYIb2j4UiWnrPYyiZjFmeNAk5UmK3CYj1Nw9C1GQV8tw8vtzLdsA7U7e77+SlkeJ8Pq3aAKU+axk3tEEbwEBqVnsRJcV61V6EavWaFOAF6M+6mDp0ZlmEzflr2P26XpJkfZFqlHsoR/KOjR3zsWN/eeAeWYdEJm9sup5D6JASt4uMsota6MKnjyV5olvd3S0hOVyYX/+7zYWnO3MDgJt8FBuIbkzuOYrb1wu/nGfBgffQXMayc71s5Z6TYsTpNn7fVBzRoAoY87KHgX1CtZbU0zzFWREkE='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIV5oT7xuCzL4PldH7OvJZlaWHrfB2vefpUXC2UG/pm4h3zND/4h+wjy6keS5Q1VI6UlrpXKtn3Ny5bcDW/oVyM=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIV5oT7xuCzL4PldH7OvJZlaWHrfB2vefpUXC2UG/pm4h3zND/4h+wjy6keS5Q1VI6UlrpXKtn3Ny5bcDW/oVyM='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJwBbpXnrVmhDA+yVaIEMD6j1xnHZa5hJz5AVJvAwX3u' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJwBbpXnrVmhDA+yVaIEMD6j1xnHZa5hJz5AVJvAwX3u'
codesearch02.opendev.org:
ansible_host: 104.130.158.27
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.130.158.27
public_v6: 2001:4800:7818:104:be76:4eff:fe04:3c89
host_keys:
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMKUPif2C2NHv4annldTFX2fxJpC//Z01OWeBla6OMAvGRZShGM76D9ENE1TsX5bbTxOA+gCJhFt0aNyWSKnsxc='
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDDBVXobu9YcuE2oJHXnu8LjaU1jKBO9g3euraNiGguC7hlVcXtgTJphx+I8n6LqyuIA3C3RgKGPFwLuNesxGD/JA5n+rkTAxAzo2tdQaUx2cXner/nr232hggxIswOgpwbFk5MoBPX6T8UqTZs1uN2oEa/8OTzBJDpZ6TCSJN8ewo3Ci3QB0Pl4/NQmLNHWIqSBNDm3DHPjgFxOtVqcnX+BoyBLw0IqVfuk2wXxDjSiV2y2hhg1Tfq6UHGIA6f81Ke2mRfEuDQ7Yob64WXyI+UIdXHByEBzQbflGTRR9Vo9iT395rQJVMuOxAO+NjPi8jnji8wB4VdFP++pvGxnfA6zBTFUm0anarqhruA3GRuQus/HNC96nwROo2Mi8seLodc//1SLhFgvLlJzntxZyjU1i+u1RWxFAT8TpZRLcM+5xdH6i/L6FfSfw9cjnBvKpfXCh6Mav3UilWiwc6PtHIEhGPCCaxv9xSmrl/U5/ALEy6YxLtMjzv+VpTxJifEmQs='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNhRF9X8xa5EQ9NvDwZuJ7qpXpOE8lZg7Ks5JAvedSa'
eavesdrop01.opendev.org: eavesdrop01.opendev.org:
ansible_host: 104.239.144.232 ansible_host: 104.239.144.232
location: location:

5
inventory/service/host_vars/codesearch02.opendev.org.yaml Normal file
View File

@@ -0,0 +1,5 @@
letsencrypt_certs:
codesearch02-opendev-org-main:
- codesearch02.opendev.org
- codesearch.opendev.org
- codesearch.openstack.org

3
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
View File

@@ -158,6 +158,9 @@
- name: letsencrypt updated codesearch01-opendev-org-main - name: letsencrypt updated codesearch01-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated codesearch02-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
# nodepool # nodepool
- name: letsencrypt updated nb01-opendev-org-main - name: letsencrypt updated nb01-opendev-org-main

2
playbooks/zuul/run-base.yaml
View File

@@ -117,6 +117,7 @@
- group_vars/adns.yaml - group_vars/adns.yaml
- group_vars/adns-primary.yaml - group_vars/adns-primary.yaml
- group_vars/bastion.yaml - group_vars/bastion.yaml
- group_vars/codesearch.yaml
- group_vars/eavesdrop.yaml - group_vars/eavesdrop.yaml
- group_vars/nodepool.yaml - group_vars/nodepool.yaml
- group_vars/registry.yaml - group_vars/registry.yaml
@@ -142,7 +143,6 @@
- group_vars/zuul-scheduler.yaml - group_vars/zuul-scheduler.yaml
- group_vars/zuul-web.yaml - group_vars/zuul-web.yaml
- host_vars/borg-backup01.region.provider.opendev.org.yaml - host_vars/borg-backup01.region.provider.opendev.org.yaml
- host_vars/codesearch01.opendev.org.yaml
- host_vars/etherpad99.opendev.org.yaml - host_vars/etherpad99.opendev.org.yaml
- host_vars/letsencrypt01.opendev.org.yaml - host_vars/letsencrypt01.opendev.org.yaml
- host_vars/letsencrypt02.opendev.org.yaml - host_vars/letsencrypt02.opendev.org.yaml

0
playbooks/zuul/templates/host_vars/codesearch01.opendev.org.yaml.j2 → playbooks/zuul/templates/group_vars/codesearch.yaml.j2
View File

2
testinfra/test_codesearch.py
View File

@@ -14,7 +14,7 @@
from util import take_screenshots from util import take_screenshots
testinfra_hosts = ['codesearch01.opendev.org'] testinfra_hosts = ['codesearch02.opendev.org']
def test_codesearch_container_listening(host): def test_codesearch_container_listening(host):

1
zuul.d/infra-prod.yaml
View File

@@ -540,6 +540,7 @@
- inventory/base - inventory/base
- playbooks/service-codesearch.yaml - playbooks/service-codesearch.yaml
- inventory/service/host_vars/codesearch01.opendev.yaml - inventory/service/host_vars/codesearch01.opendev.yaml
- inventory/service/host_vars/codesearch02.opendev.yaml
- inventory/service/group_vars/codesearch - inventory/service/group_vars/codesearch
- playbooks/roles/install-docker/ - playbooks/roles/install-docker/
- playbooks/roles/pip3/ - playbooks/roles/pip3/

5
zuul.d/system-config-run.yaml
View File

@@ -596,8 +596,8 @@
nodeset: nodeset:
nodes: nodes:
- <<: *bridge_node_x86 - <<: *bridge_node_x86
- name: codesearch01.opendev.org - name: codesearch02.opendev.org
label: ubuntu-focal label: ubuntu-noble
groups: groups:
- <<: *bastion_group - <<: *bastion_group
vars: vars:
@@ -613,6 +613,7 @@
- playbooks/roles/install-docker/ - playbooks/roles/install-docker/
- playbooks/roles/pip3/ - playbooks/roles/pip3/
- playbooks/roles/run-selenium/ - playbooks/roles/run-selenium/
- playbooks/zuul/templates/group_vars/codesearch.yaml.j2
- testinfra/util.py - testinfra/util.py
- docker/hound/ - docker/hound/
- testinfra/test_codesearch.py - testinfra/test_codesearch.py