Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2017-08-23 19:45:30 +00:00
commit 86ac3f0a01
11 changed files with 13 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/cloud
View file

@ -58,7 +58,6 @@ jenkins-slave-el7.fedorainfracloud.org
jenkins-slave-f26.fedorainfracloud.org
jenkins-slave-f25.fedorainfracloud.org
jenkins-slave-f25-ppc64le.fedorainfracloud.org
kolinahr.fedorainfracloud.org
lists-dev.fedorainfracloud.org
magazine2.fedorainfracloud.org
modernpaste.fedorainfracloud.org

2
inventory/host_vars/java-deptools.fedorainfracloud.org
View file

@ -1,5 +1,5 @@
---
image: "{{ fedora24_x86_64 }}"
image: "{{ fedora26_x86_64 }}"
instance_type: m1.medium
keypair: fedora-admin-20130801
security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,web-443-anywhere-persistent,all-icmp-persistent

18
inventory/host_vars/kolinahr.fedorainfracloud.org
View file

@ -1,18 +0,0 @@
---
image: "{{ fedora24_x86_64 }}"
instance_type: m1.medium
keypair: fedora-admin-20130801
security_group: ssh-anywhere-persistent,all-icmp-persistent,default,web-80-anywhere-persistent,web-443-anywhere-persistent
zone: nova
tcp_ports: [22, 80, 443]
inventory_tenant: persistent
inventory_instance_name: kolinahr
hostbase: kolinahr
public_ip: 209.132.184.59
root_auth_users: sgallagh
description: kolinahr development instance
cloud_networks:
# persistent-net
- net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"

3
inventory/host_vars/people02.fedoraproject.org
View file

@ -31,3 +31,6 @@ mem_size: 8192
num_cpus: 4
rsyncd_conf: "rsyncd.conf.people01.fedoraproject.org"
ssh_hostnames:
- fedorapeople.org

2
inventory/inventory
View file

@ -1159,8 +1159,6 @@ eclipse.fedorainfracloud.org
iddev.fedorainfracloud.org
# commops - ticket 5380
commops.fedorainfracloud.org
# kolinahr - issue 5491
kolinahr.fedorainfracloud.org
# respins
respins.fedorainfracloud.org
# waiverdb-dev - ticket 6009

1
master.yml
View file

@ -144,7 +144,6 @@
- include: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/insim.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/kolinahr.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/magazine2.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/modernpaste.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/modularity.fedorainfracloud.org.yml

32
playbooks/hosts/kolinahr.fedorainfracloud.org.yml
View file

@ -1,32 +0,0 @@
- name: check/create instance
hosts: kolinahr.fedorainfracloud.org
gather_facts: False
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- /srv/private/ansible/vars.yml
- /srv/web/infra/ansible/vars/fedora-cloud.yml
- /srv/private/ansible/files/openstack/passwords.yml
tasks:
- include: "{{ tasks_path }}/persistent_cloud.yml"
handlers:
- include: "{{ handlers_path }}/restart_services.yml"
- name: setup all the things
hosts: kolinahr.fedorainfracloud.org
gather_facts: True
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- /srv/private/ansible/vars.yml
- /srv/private/ansible/files/openstack/passwords.yml
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
pre_tasks:
- include: "{{ tasks_path }}/cloud_setup_basic.yml"
- name: set hostname (required by some services, at least postfix need it)
hostname: name="{{inventory_hostname}}"
roles:
- basessh

6
roles/copr/backend/files/provision/provision_builder_tasks.yml
View file

@ -68,3 +68,9 @@
- name: disable core dumps
ini_file: dest=/etc/systemd/coredump.conf section=Coredump option=Storage value=none
- name: 'Remove %_install_langs from /etc/rpm/macros.image-language-conf'
lineinfile:
dest: '/etc/rpm/macros.image-language-conf'
regexp: '^%_install_lang.*'
state: 'absent'

2
roles/fedmsg/base/templates/endpoints-cico.py.j2
View file

@ -1,11 +1,9 @@
# This tells nodes to pull messages from ci.centos.org
config = dict(
{% if env == 'staging' %}
endpoints={
"centos-ci-public-relay": [
"tcp://fedmsg-relay.ci.centos.org:9940",
],
},
{% endif %}
)

6
roles/nagios_server/templates/nagios/configs/cgi.cfg.j2
View file

@ -143,7 +143,7 @@ authorized_for_configuration_information=*
# authenticated to the web server.
#authorized_for_system_commands=nagiosadmin
authorized_for_system_commands=athmane,ausil,averi,badone,codeblock,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillio,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,ricky,toshio,spot,mahrud,karsten,parasense,pingou,tflink,mizdebsk,msimacek,stickster
authorized_for_system_commands=athmane,ausil,averi,badone,codeblock,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillion,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,pbrobinson,ricky,toshio,spot,mahrud,karsten,parasense,pingou,tflink,mizdebsk,msimacek,stickster
@ -173,9 +173,9 @@ authorized_for_all_hosts=*
#authorized_for_all_service_commands=nagiosadmin
#authorized_for_all_host_commands=nagiosadmin
authorized_for_all_service_commands=athmane,ausil,averi,badone,codeblock,dwa,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillio,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,ricky,toshio,spot,mahrud,dwa,karsten,pingou,tflink,mizdebsk,msimacek,stickster
authorized_for_all_service_commands=athmane,ausil,averi,badone,codeblock,dwa,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillion,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,pbrobinson,ricky,toshio,spot,mahrud,dwa,karsten,pingou,tflink,mizdebsk,msimacek,stickster
authorized_for_all_host_commands=athmane,ausil,averi,badone,codeblock,dwa,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillio,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,ricky,toshio,spot,mahrud,dwa,karsten,pingou,tflink,mizdebsk,msimacek,stickster
authorized_for_all_host_commands=athmane,ausil,averi,badone,codeblock,dwa,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillion,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,pbrobinson,ricky,toshio,spot,mahrud,dwa,karsten,pingou,tflink,mizdebsk,msimacek,stickster

14
tasks/persistent_cloud.yml
View file

@ -55,20 +55,6 @@
local_action: wait_for host={{ public_ip }} port=22 delay=1 timeout=600
when: host_is_up|failed
- name: gather ssh host key from new instance
local_action: command ssh-keyscan -t rsa {{ inventory_hostname }}
ignore_errors: True
register: hostkey
when: host_is_up|failed
- name: add new ssh host key (you still need to add it to official ssh_host_keys later)
local_action: known_hosts path={{ item }} key={{ hostkey.stdout }} host={{ inventory_hostname }} state=present
ignore_errors: True
with_items:
- /root/.ssh/known_hosts
- /etc/ssh/ssh_known_hosts
when: host_is_up|failed
# SSH is up and running, however cloud-init still did not deployed ssh keypair
# we have to wait some time. 10 sec is usually enough, but not always.