From 014f08d2a23c2252b90db317fa432873f8413d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 19 Feb 2020 12:26:11 +0100
Subject: [PATCH] copr: add copr-dist-git-dev in aws

---
 .../copr-dist-git-dev.fedorainfracloud.org    | 43 +++++++++++--------
 inventory/inventory                           |  4 ++
 playbooks/groups/copr-dist-git.yml            |  7 +--
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org
index 3750bca34a..8d807a9ac4 100644
--- a/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org
+++ b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org
@@ -1,25 +1,30 @@
 ---
-instance_type: ms1.small
-image: "{{ fedora30_x86_64 }}"
-#image: rhel7-20141015
-keypair: fedora-admin-20130801
-security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,all-icmp-persistent
-zone: nova
-hostbase: copr-dist-git-dev-
-public_ip: 209.132.184.179
-root_auth_users:  ryanlerch pingou msuchy dturecek frostyx praiskup schlupov thrnciar
-description: dist-git for copr service - dev instance
-tcp_ports: [22, 80, 443]
-# volumes:  copr-dist-git-dev
-volumes: [ {volume_id: '64f21445-d758-4b19-8401-e497cd0ae012', device: '/dev/vdc'} ]
-inventory_tenant: persistent
-# name of machine in OpenStack
+ansible_ssh_user: fedora
+ansible_become_user: root
+ansible_become: yes
+datacenter: aws
+inventory_hostname: "copr-dist-git-dev.cloud.fedoraproject.org"
 inventory_instance_name: copr-dist-git-dev
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
+
+#instance_type: t3a.medium
+#image: "{{ fedora31_x86_64 }}"
+#keypair: fedora-admin-20130801
+hostbase: copr-dist-git-dev-
+public_ip: 35.153.206.59
+root_auth_users: msuchy frostyx dturecek praiskup schlupov thrnciar
+description: copr dist git - dev instance
+
 
 # Copr vars
 copr_hostbase: copr-dist-git-dev
 
-# There is no python2 on F30
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/inventory b/inventory/inventory
index a7dc9df9ba..efcadcfc0e 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -662,6 +662,7 @@ composer.stg.phx2.fedoraproject.org
 copr-be-dev.cloud.fedoraproject.org
 copr-be-stg.fedorainfracloud.org
 copr-dist-git-dev.fedorainfracloud.org
+copr-dist-git-dev-aws.fedorainfracloud.org
 copr-dist-git-stg.fedorainfracloud.org
 copr-fe-dev.cloud.fedoraproject.org
 copr-frontend01.stg.phx2.fedoraproject.org
@@ -1132,6 +1133,9 @@ copr-keygen-dev-aws.fedorainfracloud.org
 [copr_dist_git_dev]
 copr-dist-git-dev.fedorainfracloud.org
 
+[copr_dist_git_dev_aws]
+copr-dist-git-dev-aws.fedorainfracloud.org
+
 [copr_front_stg]
 copr-frontend01.stg.phx2.fedoraproject.org
 copr-frontend02.stg.phx2.fedoraproject.org
diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml
index be4233b88a..e71cea6e7c 100644
--- a/playbooks/groups/copr-dist-git.yml
+++ b/playbooks/groups/copr-dist-git.yml
@@ -1,5 +1,5 @@
 - name: check/create instance
-  hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git
+  hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git:copr_dist_git_dev_aws
   user: root
   gather_facts: False
 
@@ -13,7 +13,7 @@
   - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: cloud basic setup
-  hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git
+  hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git:copr_dist_git_dev_aws
   user: root
   gather_facts: True
   vars_files:
@@ -27,9 +27,10 @@
   - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{copr_hostbase}}.fedorainfracloud.org"
+    when: datacenter != "aws"
 
 - name: provision instance
-  hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git
+  hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git:copr_dist_git_dev_aws
   user: root
   gather_facts: True