From 3ca845b57778ad80c4b16655de769c8dac8d2620 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Aug 2018 09:00:57 +0000 Subject: [PATCH] Provision copr stg cloud machines --- inventory/group_vars/copr-back-stg | 29 ++++++++++++++++++++++++++ inventory/group_vars/copr-dist-git-stg | 6 ++++++ inventory/group_vars/copr-keygen-stg | 13 ++++++++++++ playbooks/groups/copr-backend.yml | 7 +++---- playbooks/groups/copr-dist-git.yml | 6 +++--- playbooks/groups/copr-keygen.yml | 9 +++----- 6 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 inventory/group_vars/copr-back-stg create mode 100644 inventory/group_vars/copr-dist-git-stg create mode 100644 inventory/group_vars/copr-keygen-stg diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr-back-stg new file mode 100644 index 0000000000..c144801e78 --- /dev/null +++ b/inventory/group_vars/copr-back-stg @@ -0,0 +1,29 @@ +--- +_lighttpd_conf_src: "lighttpd/lighttpd_dev.conf" + +copr_nova_auth_url: "https://fedorainfracloud.org:5000/v2.0" +copr_nova_tenant_id: "a6ff2158641c439a8426d7facab45437" +copr_nova_tenant_name: "coprdev" +copr_nova_username: "copr" + +copr_builder_image_name: "builder-f24" +copr_builder_flavor_name: "ms2.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: "true" + +do_sign: "true" + +spawn_in_advance: "false" +frontend_base_url: "https://copr.stg.fedoraproject.org" + +# These variables are pushed into /etc/system_identification by the base role. +# Groups and individual hosts should override them with specific info. +# See http://infrastructure.fedoraproject.org/csi/security-policy/ + +csi_security_category: Moderate +csi_primary_contact: "msuchy (mirek), clime, frostyx, dturecek IRC #fedora-admin, #fedora-buildsys" +csi_purpose: Provide the testing environment of copr's backend +csi_relationship: This host is the testing environment for the cloud infrastructure of copr's backend diff --git a/inventory/group_vars/copr-dist-git-stg b/inventory/group_vars/copr-dist-git-stg new file mode 100644 index 0000000000..28b1b79cb2 --- /dev/null +++ b/inventory/group_vars/copr-dist-git-stg @@ -0,0 +1,6 @@ +--- +tcp_ports: [22, 80] +datacenter: cloud +freezes: false +devel: true +custom_rules: ['-A INPUT -p tcp -m tcp --dport 443 -j ACCEPT'] diff --git a/inventory/group_vars/copr-keygen-stg b/inventory/group_vars/copr-keygen-stg new file mode 100644 index 0000000000..d66d69a691 --- /dev/null +++ b/inventory/group_vars/copr-keygen-stg @@ -0,0 +1,13 @@ +--- +copr_hostbase: copr-keygen-dev +tcp_ports: [] + +# http + signd dest ports +#custom_rules: [ '-A INPUT -p tcp -m tcp -s 172.25.32.232 --dport 80 -j ACCEPT', +# '-A INPUT -p tcp -m tcp -s 172.25.157.237 --dport 80 -j ACCEPT', +# '-A INPUT -p tcp -m tcp -s 172.25.32.232 --dport 5167 -j ACCEPT', +# '-A INPUT -p tcp -m tcp -s 172.25.157.237 --dport 5167 -j ACCEPT'] + +datacenter: cloud + +freezes: false diff --git a/playbooks/groups/copr-backend.yml b/playbooks/groups/copr-backend.yml index f11a188f3e..4b9a03e312 100644 --- a/playbooks/groups/copr-backend.yml +++ b/playbooks/groups/copr-backend.yml @@ -1,6 +1,5 @@ - name: check/create instance - #hosts: copr-back - hosts: copr-back:copr-back-dev + hosts: copr-back-dev:copr-back-stg:copr-back user: root gather_facts: False @@ -13,7 +12,7 @@ - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup - hosts: copr-back:copr-back-dev + hosts: copr-back-dev:copr-back-stg:copr-back user: root gather_facts: True vars_files: @@ -28,7 +27,7 @@ hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" - name: provision instance - hosts: copr-back:copr-back-dev + hosts: copr-back-dev:copr-back-stg:copr-back user: root gather_facts: True diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml index 4a3dff1eb3..658c7aa442 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 + hosts: copr-dist-git-dev:copr-dist-git-stg:copr-dist-git 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 + hosts: copr-dist-git-dev:copr-dist-git-stg:copr-dist-git user: root gather_facts: True vars_files: @@ -27,7 +27,7 @@ hostname: name="{{copr_hostbase}}.fedorainfracloud.org" - name: provision instance - hosts: copr-dist-git-dev:copr-dist-git + hosts: copr-dist-git-dev:copr-dist-git-stg:copr-dist-git user: root gather_facts: True diff --git a/playbooks/groups/copr-keygen.yml b/playbooks/groups/copr-keygen.yml index ae40ed8f5b..f0f82127e8 100644 --- a/playbooks/groups/copr-keygen.yml +++ b/playbooks/groups/copr-keygen.yml @@ -1,6 +1,5 @@ - name: check/create instance - hosts: copr-keygen-dev:copr-keygen - #hosts: copr-keygen + hosts: copr-keygen-dev:copr-keygen-stg:copr-keygen gather_facts: False vars_files: @@ -21,8 +20,7 @@ when: facts is failed - name: cloud basic setup - hosts: copr-keygen-dev:copr-keygen - # hosts: copr-keygen + hosts: copr-keygen-dev:copr-keygen-stg:copr-keygen gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -35,8 +33,7 @@ hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" - name: provision instance - hosts: copr-keygen:copr-keygen-dev - #hosts: copr-keygen + hosts: copr-keygen-dev:copr-keygen-stg:copr-keygen gather_facts: True vars_files: