From 4e370e58a7166d253fd48b74709e9e2b68072593 Mon Sep 17 00:00:00 2001
From: Valentin Gologuzov <vgologuz@redhat.com>
Date: Tue, 19 May 2015 15:43:37 +0200
Subject: [PATCH] [copr][backend] different security groups for builder VMs in
 copr and coprdev

---
 inventory/group_vars/copr-back                             | 1 +
 inventory/group_vars/copr-back-stg                         | 1 +
 roles/copr/backend/files/provision/spinup_nova_task.yml    | 2 +-
 roles/copr/backend/templates/provision/nova_cloud_vars.yml | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back
index 39f2c4d75c..4c8e4eb41c 100644
--- a/inventory/group_vars/copr-back
+++ b/inventory/group_vars/copr-back
@@ -10,6 +10,7 @@ copr_builder_image_name: "Fedora-Cloud-Base-20141203-21"
 copr_builder_flavor_name: "m1.builder"
 copr_builder_network_name: "copr-net"
 copr_builder_key_name: "buildsys"
+copr_builder_security_groups: "ssh-anywhere-copr,default,ssh-from-persistent-copr"
 
 
 fedmsg_enabled: "true"
diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr-back-stg
index 924530ca45..6c2ee21ee4 100644
--- a/inventory/group_vars/copr-back-stg
+++ b/inventory/group_vars/copr-back-stg
@@ -10,6 +10,7 @@ copr_builder_image_name: "builder-2015-05-15"
 copr_builder_flavor_name: "m1.builder"
 copr_builder_network_name: "coprdev-net"
 copr_builder_key_name: "buildsys"
+copr_builder_security_groups: "ssh-anywhere-coprdev,default,ssh-from-persistent-coprdev"
 
 fedmsg_enabled: "false"
 
diff --git a/roles/copr/backend/files/provision/spinup_nova_task.yml b/roles/copr/backend/files/provision/spinup_nova_task.yml
index 8fb1de95dd..77667555b9 100644
--- a/roles/copr/backend/files/provision/spinup_nova_task.yml
+++ b/roles/copr/backend/files/provision/spinup_nova_task.yml
@@ -10,7 +10,7 @@
     image_id: "{{ image_name|image_name_to_id(OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME, OS_AUTH_URL) }}"
     wait_for: "{{ max_spawn_time }}"
     flavor_id: "{{ flavor_name|flavor_name_to_id(OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME, OS_AUTH_URL) }}"
-    security_groups: ssh-anywhere-coprdev,default,ssh-from-persistent-coprdev #,ssh-internal-persistent
+    security_groups: "{{ security_groups }}" #,ssh-internal-persistent
     key_name: "{{ key_name }}"
     nics:
       - net-id: "{{ network_name|network_name_to_id(OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME, OS_AUTH_URL) }}"
diff --git a/roles/copr/backend/templates/provision/nova_cloud_vars.yml b/roles/copr/backend/templates/provision/nova_cloud_vars.yml
index ccea179280..d426e8a4cc 100644
--- a/roles/copr/backend/templates/provision/nova_cloud_vars.yml
+++ b/roles/copr/backend/templates/provision/nova_cloud_vars.yml
@@ -15,3 +15,4 @@ image_name: "{{ copr_builder_image_name }}"
 flavor_name: "{{ copr_builder_flavor_name }}"
 network_name: "{{ copr_builder_network_name }}"
 key_name: "{{ copr_builder_key_name }}"
+security_groups: "{{ copr_builder_security_groups }}"