From 740a155fb1c23cfd54fe8112d5432bd7f426ad98 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 6 Nov 2014 18:55:40 +0000 Subject: [PATCH] Fold files/releng/ into roles/releng/files/ --- {files/releng => roles/releng/files}/branched | 0 {files/releng => roles/releng/files}/fedmsg/base.py | 0 .../releng => roles/releng/files}/fedmsg/endpoints.py | 0 {files/releng => roles/releng/files}/fedmsg/ircbot.py | 0 {files/releng => roles/releng/files}/fedmsg/ssl.py | 0 .../releng/files}/fedora-branched-compose-armhfp.cfg | 0 .../releng/files}/fedora-branched-compose-i386.cfg | 0 .../releng/files}/fedora-branched-compose-x86_64.cfg | 0 .../releng/files}/fedora-branched-pungi-i386.cfg | 0 .../releng/files}/fedora-branched-pungi-x86_64.cfg | 0 .../releng/files}/fedora-devel-pungi-ppc.cfg | 0 .../releng/files}/fedora-rawhide-compose-armhfp.cfg | 0 .../releng/files}/fedora-rawhide-compose-i386.cfg | 0 .../releng/files}/fedora-rawhide-compose-x86_64.cfg | 0 .../releng/files}/fedora-rawhide-pungi-i386.cfg | 0 .../releng/files}/fedora-rawhide-pungi-x86_64.cfg | 0 .../releng => roles/releng/files}/mash/masher.config | 0 .../releng/files}/mash/masher.id_rsa.pub | 0 {files/releng => roles/releng/files}/rawhide | 0 .../releng => roles/releng/files}/update-fullfilelist | 0 roles/releng/tasks/main.yml | 10 +++++----- 21 files changed, 5 insertions(+), 5 deletions(-) rename {files/releng => roles/releng/files}/branched (100%) rename {files/releng => roles/releng/files}/fedmsg/base.py (100%) rename {files/releng => roles/releng/files}/fedmsg/endpoints.py (100%) rename {files/releng => roles/releng/files}/fedmsg/ircbot.py (100%) rename {files/releng => roles/releng/files}/fedmsg/ssl.py (100%) rename {files/releng => roles/releng/files}/fedora-branched-compose-armhfp.cfg (100%) rename {files/releng => roles/releng/files}/fedora-branched-compose-i386.cfg (100%) rename {files/releng => roles/releng/files}/fedora-branched-compose-x86_64.cfg (100%) rename {files/releng => roles/releng/files}/fedora-branched-pungi-i386.cfg (100%) rename {files/releng => roles/releng/files}/fedora-branched-pungi-x86_64.cfg (100%) rename {files/releng => roles/releng/files}/fedora-devel-pungi-ppc.cfg (100%) rename {files/releng => roles/releng/files}/fedora-rawhide-compose-armhfp.cfg (100%) rename {files/releng => roles/releng/files}/fedora-rawhide-compose-i386.cfg (100%) rename {files/releng => roles/releng/files}/fedora-rawhide-compose-x86_64.cfg (100%) rename {files/releng => roles/releng/files}/fedora-rawhide-pungi-i386.cfg (100%) rename {files/releng => roles/releng/files}/fedora-rawhide-pungi-x86_64.cfg (100%) rename {files/releng => roles/releng/files}/mash/masher.config (100%) rename {files/releng => roles/releng/files}/mash/masher.id_rsa.pub (100%) rename {files/releng => roles/releng/files}/rawhide (100%) rename {files/releng => roles/releng/files}/update-fullfilelist (100%) diff --git a/files/releng/branched b/roles/releng/files/branched similarity index 100% rename from files/releng/branched rename to roles/releng/files/branched diff --git a/files/releng/fedmsg/base.py b/roles/releng/files/fedmsg/base.py similarity index 100% rename from files/releng/fedmsg/base.py rename to roles/releng/files/fedmsg/base.py diff --git a/files/releng/fedmsg/endpoints.py b/roles/releng/files/fedmsg/endpoints.py similarity index 100% rename from files/releng/fedmsg/endpoints.py rename to roles/releng/files/fedmsg/endpoints.py diff --git a/files/releng/fedmsg/ircbot.py b/roles/releng/files/fedmsg/ircbot.py similarity index 100% rename from files/releng/fedmsg/ircbot.py rename to roles/releng/files/fedmsg/ircbot.py diff --git a/files/releng/fedmsg/ssl.py b/roles/releng/files/fedmsg/ssl.py similarity index 100% rename from files/releng/fedmsg/ssl.py rename to roles/releng/files/fedmsg/ssl.py diff --git a/files/releng/fedora-branched-compose-armhfp.cfg b/roles/releng/files/fedora-branched-compose-armhfp.cfg similarity index 100% rename from files/releng/fedora-branched-compose-armhfp.cfg rename to roles/releng/files/fedora-branched-compose-armhfp.cfg diff --git a/files/releng/fedora-branched-compose-i386.cfg b/roles/releng/files/fedora-branched-compose-i386.cfg similarity index 100% rename from files/releng/fedora-branched-compose-i386.cfg rename to roles/releng/files/fedora-branched-compose-i386.cfg diff --git a/files/releng/fedora-branched-compose-x86_64.cfg b/roles/releng/files/fedora-branched-compose-x86_64.cfg similarity index 100% rename from files/releng/fedora-branched-compose-x86_64.cfg rename to roles/releng/files/fedora-branched-compose-x86_64.cfg diff --git a/files/releng/fedora-branched-pungi-i386.cfg b/roles/releng/files/fedora-branched-pungi-i386.cfg similarity index 100% rename from files/releng/fedora-branched-pungi-i386.cfg rename to roles/releng/files/fedora-branched-pungi-i386.cfg diff --git a/files/releng/fedora-branched-pungi-x86_64.cfg b/roles/releng/files/fedora-branched-pungi-x86_64.cfg similarity index 100% rename from files/releng/fedora-branched-pungi-x86_64.cfg rename to roles/releng/files/fedora-branched-pungi-x86_64.cfg diff --git a/files/releng/fedora-devel-pungi-ppc.cfg b/roles/releng/files/fedora-devel-pungi-ppc.cfg similarity index 100% rename from files/releng/fedora-devel-pungi-ppc.cfg rename to roles/releng/files/fedora-devel-pungi-ppc.cfg diff --git a/files/releng/fedora-rawhide-compose-armhfp.cfg b/roles/releng/files/fedora-rawhide-compose-armhfp.cfg similarity index 100% rename from files/releng/fedora-rawhide-compose-armhfp.cfg rename to roles/releng/files/fedora-rawhide-compose-armhfp.cfg diff --git a/files/releng/fedora-rawhide-compose-i386.cfg b/roles/releng/files/fedora-rawhide-compose-i386.cfg similarity index 100% rename from files/releng/fedora-rawhide-compose-i386.cfg rename to roles/releng/files/fedora-rawhide-compose-i386.cfg diff --git a/files/releng/fedora-rawhide-compose-x86_64.cfg b/roles/releng/files/fedora-rawhide-compose-x86_64.cfg similarity index 100% rename from files/releng/fedora-rawhide-compose-x86_64.cfg rename to roles/releng/files/fedora-rawhide-compose-x86_64.cfg diff --git a/files/releng/fedora-rawhide-pungi-i386.cfg b/roles/releng/files/fedora-rawhide-pungi-i386.cfg similarity index 100% rename from files/releng/fedora-rawhide-pungi-i386.cfg rename to roles/releng/files/fedora-rawhide-pungi-i386.cfg diff --git a/files/releng/fedora-rawhide-pungi-x86_64.cfg b/roles/releng/files/fedora-rawhide-pungi-x86_64.cfg similarity index 100% rename from files/releng/fedora-rawhide-pungi-x86_64.cfg rename to roles/releng/files/fedora-rawhide-pungi-x86_64.cfg diff --git a/files/releng/mash/masher.config b/roles/releng/files/mash/masher.config similarity index 100% rename from files/releng/mash/masher.config rename to roles/releng/files/mash/masher.config diff --git a/files/releng/mash/masher.id_rsa.pub b/roles/releng/files/mash/masher.id_rsa.pub similarity index 100% rename from files/releng/mash/masher.id_rsa.pub rename to roles/releng/files/mash/masher.id_rsa.pub diff --git a/files/releng/rawhide b/roles/releng/files/rawhide similarity index 100% rename from files/releng/rawhide rename to roles/releng/files/rawhide diff --git a/files/releng/update-fullfilelist b/roles/releng/files/update-fullfilelist similarity index 100% rename from files/releng/update-fullfilelist rename to roles/releng/files/update-fullfilelist diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index 260e6e18a2..e9c3444a42 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -17,7 +17,7 @@ user: name=ftpsync uid=263 group=ftpsync createhome=yes system=yes state=present - name: add the ftpsync update-fullfilelist script - action: copy src="{{ files }}/releng/update-fullfilelist" dest=/usr/local/bin/update-fullfilelist owner=ftpsync group=ftpsync mode=555 + action: copy src=update-fullfilelist dest=/usr/local/bin/update-fullfilelist owner=ftpsync group=ftpsync mode=555 - name: add masher group action: group name=masher gid=751 system=yes state=present @@ -28,7 +28,7 @@ - name: add masher ssh dir action: file state=directory path=/home/masher/.ssh mode=700 owner=masher group=masher - name: add masher ssh keys - action: copy src="{{ files }}/releng/mash/masher.{{ item }}" dest="/home/masher/.ssh/{{ item }}" mode=600 owner=masher group=masher + action: copy src="mash/masher.{{ item }}" dest="/home/masher/.ssh/{{ item }}" mode=600 owner=masher group=masher with_items: - id_rsa.pub - config @@ -83,7 +83,7 @@ # mock configs - name: put extra special mock configs in - action: copy src="{{ files }}/releng/{{ item }}" dest="/etc/mock/{{ item }}" mode=644 + action: copy src="{{ item }}" dest="/etc/mock/{{ item }}" mode=644 with_items: - fedora-branched-compose-armhfp.cfg - fedora-rawhide-compose-armhfp.cfg @@ -113,12 +113,12 @@ # put cron job in for branched compose - name: branched compose cron - action: copy src="{{ files }}/releng/branched" dest=/etc/cron.d/branched + action: copy src="branched" dest=/etc/cron.d/branched when: inventory_hostname.startswith('branched-composer') # put cron job in for rawhide compose - name: rawhide compose cron - action: copy src="{{ files }}/releng/rawhide" dest=/etc/cron.d/rawhide + action: copy src="rawhide" dest=/etc/cron.d/rawhide when: inventory_hostname.startswith('rawhide-composer') - name: sudoers defaults