From ad5776fb00d1d5945938ba1ec83a1d7055ab56e2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 14 Sep 2020 10:04:06 -0700 Subject: [PATCH] inventory: add a db03.stg mariadb server for wiki. Signed-off-by: Kevin Fenzi --- ...project.org => db03.stg.iad2.fedoraproject.org} | 14 +++++++------- inventory/inventory | 4 ++-- playbooks/groups/mariadb-server.yml | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) rename inventory/host_vars/{db03.stg.phx2.fedoraproject.org => db03.stg.iad2.fedoraproject.org} (72%) diff --git a/inventory/host_vars/db03.stg.phx2.fedoraproject.org b/inventory/host_vars/db03.stg.iad2.fedoraproject.org similarity index 72% rename from inventory/host_vars/db03.stg.phx2.fedoraproject.org rename to inventory/host_vars/db03.stg.iad2.fedoraproject.org index 79bb84066b..3e05c0ae0e 100644 --- a/inventory/host_vars/db03.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db03.stg.iad2.fedoraproject.org @@ -1,13 +1,13 @@ --- nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +gw: 10.3.166.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2 +ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.128.95 -vmhost: virthost03.stg.phx2.fedoraproject.org -datacenter: phx2 +eth0_ip: 10.3.166.35 +vmhost: virthost06.stg.iad2.fedoraproject.org +datacenter: iad2 # This is a generic list, monitored by collectd databases: diff --git a/inventory/inventory b/inventory/inventory index ec8bb9813c..3a27238b5c 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -204,7 +204,7 @@ db-openqa01.iad2.fedoraproject.org [dbserver_stg] db-fas01.stg.iad2.fedoraproject.org db01.stg.iad2.fedoraproject.org -# db03.stg.iad2.fedoraproject.org +db03.stg.iad2.fedoraproject.org db-koji01.stg.iad2.fedoraproject.org # clients that talk to the main postgres servers @@ -594,7 +594,7 @@ copr-keygen-dev.aws.fedoraproject.org db-fas01.stg.iad2.fedoraproject.org db-koji01.stg.iad2.fedoraproject.org db01.stg.iad2.fedoraproject.org -# db03.stg.iad2.fedoraproject.org +db03.stg.iad2.fedoraproject.org # oci-candidate-registry01.stg.iad2.fedoraproject.org # oci-registry01.stg.iad2.fedoraproject.org # #fas01.stg.iad2.fedoraproject.org diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index 0a9492da5b..149254e739 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -19,7 +19,7 @@ roles: - base - rkhunter - - fas_client + - { role: fas_client, when: env != "staging" } - nagios_client - hosts - mariadb_server @@ -31,6 +31,7 @@ tasks: - import_tasks: "{{ tasks_path }}/2fa_client.yml" + when: env != "staging" - import_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task