diff --git a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org index 7b286b290f..a6f07c31a3 100644 --- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org @@ -6,7 +6,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-be-dev- public_ip: 209.132.184.53 -root_auth_users: msuchy pingou frostyx dturecek clime praiskup +root_auth_users: msuchy pingou frostyx dturecek praiskup description: copr dispatcher and repo server - dev instance tcp_ports: ['22', '80', '443', '2003', '4001'] # volumes: copr-be-dev-data diff --git a/inventory/host_vars/copr-be-stg.fedorainfracloud.org b/inventory/host_vars/copr-be-stg.fedorainfracloud.org index 1c632b1a9b..5ff8018508 100644 --- a/inventory/host_vars/copr-be-stg.fedorainfracloud.org +++ b/inventory/host_vars/copr-be-stg.fedorainfracloud.org @@ -6,7 +6,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-be-stg- public_ip: 209.132.184.44 -root_auth_users: msuchy pingou frostyx dturecek clime praiskup +root_auth_users: msuchy pingou frostyx dturecek praiskup description: copr dispatcher and repo server - stg instance tcp_ports: ['22', '80', '443', '2003', '4001'] # volumes: copr-be-stg-data diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org index 3aaa57329a..e3ac2d4182 100644 --- a/inventory/host_vars/copr-be.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org @@ -7,7 +7,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-be- public_ip: 209.132.184.48 -root_auth_users: msuchy clime frostyx praiskup +root_auth_users: msuchy frostyx praiskup description: copr dispatcher and repo server volumes: [ {volume_id: '63c3a40c-e228-417a-97a2-e2c34730bf3b', device: '/dev/vdc'} ] inventory_tenant: persistent diff --git a/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org index 941e9acc9d..0737405282 100644 --- a/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org +++ b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org @@ -7,7 +7,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-dist-git-dev- public_ip: 209.132.184.179 -root_auth_users: ryanlerch pingou msuchy dturecek frostyx clime praiskup +root_auth_users: ryanlerch pingou msuchy dturecek frostyx praiskup description: dist-git for copr service - dev instance tcp_ports: [22, 80, 443] # volumes: copr-dist-git-dev diff --git a/inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org b/inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org index 811ed73929..8022bb4832 100644 --- a/inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org +++ b/inventory/host_vars/copr-dist-git-stg.fedorainfracloud.org @@ -6,7 +6,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-dist-git-stg- public_ip: 209.132.184.57 -root_auth_users: ryanlerch pingou msuchy dturecek frostyx clime frostyx praiskup +root_auth_users: ryanlerch pingou msuchy dturecek frostyx frostyx praiskup description: dist-git for copr service - stg instance tcp_ports: [22, 80, 443] # volumes: copr-dist-git-stg diff --git a/inventory/host_vars/copr-dist-git.fedorainfracloud.org b/inventory/host_vars/copr-dist-git.fedorainfracloud.org index 7489eadd4f..88d5e5c7c9 100644 --- a/inventory/host_vars/copr-dist-git.fedorainfracloud.org +++ b/inventory/host_vars/copr-dist-git.fedorainfracloud.org @@ -6,7 +6,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-dist-git public_ip: 209.132.184.163 -root_auth_users: msuchy clime frostyx praiskup +root_auth_users: msuchy frostyx praiskup description: dist-git for copr service - prod instance tcp_ports: [22, 80, 443] # volumes: copr-dist-git, copr-dist-git-log diff --git a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org index 7aa67486c1..79b2009268 100644 --- a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org @@ -6,7 +6,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-fe-dev- public_ip: 209.132.184.55 -root_auth_users: ryanlerch pingou msuchy dturecek frostyx clime praiskup +root_auth_users: ryanlerch pingou msuchy dturecek frostyx praiskup description: copr frontend server - dev instance tcp_ports: [22, 80, 443] # volumes: copr-fe-dev-db diff --git a/inventory/host_vars/copr-fe.cloud.fedoraproject.org b/inventory/host_vars/copr-fe.cloud.fedoraproject.org index d5b6684583..cca23af08f 100644 --- a/inventory/host_vars/copr-fe.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-fe.cloud.fedoraproject.org @@ -9,7 +9,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-fe- public_ip: 209.132.184.54 -root_auth_users: msuchy clime frostyx praiskup +root_auth_users: msuchy frostyx praiskup description: copr frontend server - prod instance tcp_ports: [22, 80, 443] volumes: [ {volume_id: '8f790db7-8294-4d2b-8bae-7af5961ce0f8', device: '/dev/vdc'} ] diff --git a/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org index 23352623b0..ff4272d132 100644 --- a/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org @@ -7,7 +7,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-keygen-dev- public_ip: 209.132.184.46 -root_auth_users: msuchy clime frostyx dturecek praiskup +root_auth_users: msuchy frostyx dturecek praiskup volumes: [ {volume_id: '9e2b4c55-9ec3-4508-af46-a40f3a5bd982', device: '/dev/vdc'} ] description: copr key gen and sign host - dev instance diff --git a/inventory/host_vars/copr-keygen-stg.fedorainfracloud.org b/inventory/host_vars/copr-keygen-stg.fedorainfracloud.org index edaf8858b2..94a2b194fa 100644 --- a/inventory/host_vars/copr-keygen-stg.fedorainfracloud.org +++ b/inventory/host_vars/copr-keygen-stg.fedorainfracloud.org @@ -7,7 +7,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh zone: nova hostbase: copr-keygen-stg- public_ip: 209.132.184.56 -root_auth_users: msuchy clime frostyx dturecek praiskup +root_auth_users: msuchy frostyx dturecek praiskup volumes: [ {volume_id: '5424ff3c-b1c6-4291-a0ed-2d30924f4f88', device: '/dev/vdc'} ] description: copr keygen and sign host - stg instance diff --git a/inventory/host_vars/copr-keygen.cloud.fedoraproject.org b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org index 685443b986..2aaa154a81 100644 --- a/inventory/host_vars/copr-keygen.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org @@ -5,7 +5,7 @@ keypair: fedora-admin-20130801 zone: nova hostbase: copr-keygen- public_ip: 209.132.184.49 -root_auth_users: msuchy clime frostyx praiskup +root_auth_users: msuchy frostyx praiskup description: copr key gen instance volumes: [ {volume_id: '761175dc-daaf-48c0-be09-5799990f97a7', device: '/dev/vdc'} ] # security_group: default diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index e54fc7a776..1a58927eaa 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -754,7 +754,6 @@ - { name: twisted, email: 'buildbot@twistedmatrix.com', tenant: pythonbots, password: "{{twisted_password}}" } - { name: roshi, email: 'roshi@fedoraproject.org', tenant: qa, password: "{{roshi_password}}" } - { name: maxamillion, email: 'maxamillion@fedoraproject.org', tenant: infrastructure, password: "{{maxamillion_password}}" } - - { name: clime, email: 'clime@redhat.com', tenant: copr, password: "{{clime_password}}" } - { name: jkadlcik, email: 'jkadlcik@redhat.com', tenant: copr, password: "{{clime_password}}" } - { name: misc, email: 'misc@redhat.com', tenant: openshift, password: "{{misc_password}}" } - { name: bowlofeggs, email: 'bowlofeggs@fedoraproject.org', tenant: transient, password: "{{bowlofeggs_password}}" } @@ -800,7 +799,6 @@ # - { name: twisted, tenant: pythonbots, password: "{{twisted_password}}", public_key: "" } - { username: admin, name: fedora-admin-20130801, tenant: admin, password: "{{ADMIN_PASS}}", public_key: "{{ lookup('file', files + '/fedora-cloud/fedora-admin-20130801.pub') }}" } - { username: asamalik, name: asamalik, tenant: scratch, password: "{{asamalik_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas asamalik') }}" } - - { username: clime, name: clime, tenant: copr, password: "{{clime_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas clime') }}" } - { username: jkadlcik, name: jkadlcik, tenant: copr, password: "{{clime_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas jkadlcik') }}" } - { username: misc, name: misc, tenant: openshift, password: "{{misc_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas misc') }}" } - { username: alivigni, name: alivigni, tenant: aos-ci-cd, password: "{{alivigni_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas alivigni') }}" }