From edbc9b21cf83f58a0409d98ca48b21f657bba479 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 14 Mar 2014 15:47:11 +0000 Subject: [PATCH] Renamespace the fedmsg module. --- inventory/group_vars/ask | 2 +- inventory/group_vars/ask-stg | 2 +- inventory/group_vars/badges-backend | 2 +- inventory/group_vars/badges-backend-stg | 2 +- inventory/group_vars/badges-web | 2 +- inventory/group_vars/badges-web-stg | 2 +- inventory/group_vars/bodhi | 2 +- inventory/group_vars/bodhi-stg | 2 +- inventory/group_vars/fedocal | 2 +- inventory/group_vars/fedocal-stg | 2 +- inventory/group_vars/mailman | 2 +- inventory/group_vars/mailman-stg | 2 +- inventory/group_vars/nuancier | 2 +- inventory/group_vars/nuancier-stg | 2 +- inventory/group_vars/packages | 2 +- inventory/group_vars/packages-stg | 2 +- inventory/group_vars/pkgdb | 2 +- inventory/group_vars/pkgdb-stg | 2 +- inventory/group_vars/summershum | 2 +- inventory/group_vars/summershum-stg | 2 +- inventory/group_vars/tagger | 2 +- inventory/group_vars/tagger-stg | 2 +- inventory/host_vars/209.132.184.142 | 4 ++-- playbooks/groups/ask.yml | 2 +- playbooks/groups/badges-backend.yml | 2 +- playbooks/groups/badges-web.yml | 2 +- playbooks/groups/bodhi.yml | 2 +- playbooks/groups/fedocal.yml | 2 +- playbooks/groups/gallery.yml | 2 +- playbooks/groups/keyserver.yml | 2 +- playbooks/groups/mailman.yml | 2 +- playbooks/groups/notifs-backend.yml | 2 +- playbooks/groups/notifs-web.yml | 2 +- playbooks/groups/nuancier.yml | 2 +- playbooks/groups/packages.yml | 2 +- playbooks/groups/pkgdb.yml | 2 +- playbooks/groups/summershum.yml | 2 +- playbooks/groups/tagger.yml | 2 +- playbooks/hosts/copr-be.cloud.fedoraproject.org.yml | 2 +- .../base}/files/selinux/fedmsg.mod | Bin .../base}/files/selinux/fedmsg.pp | Bin .../base}/files/selinux/fedmsg.te | 0 roles/{fedmsg_base => fedmsg/base}/tasks/main.yml | 0 .../base}/templates/base.py.j2 | 0 .../base}/templates/endpoints-fedbadges.py.j2 | 0 .../base}/templates/endpoints-fedocal.py.j2 | 0 .../base}/templates/endpoints-mailman.py.j2 | 0 .../base}/templates/endpoints-nuancier.py.j2 | 0 .../base}/templates/endpoints-summershum.py.j2 | 0 .../base}/templates/endpoints.py.j2 | 0 .../base}/templates/logging.py.j2 | 0 .../base}/templates/pkgdb.py.j2 | 0 .../base}/templates/policy.py.j2 | 0 .../base}/templates/relay.py.j2 | 0 .../base}/templates/ssl.py.j2 | 0 roles/{fedmsg-hub => fedmsg/hub}/tasks/main.yml | 0 56 files changed, 40 insertions(+), 40 deletions(-) rename roles/{fedmsg_base => fedmsg/base}/files/selinux/fedmsg.mod (100%) rename roles/{fedmsg_base => fedmsg/base}/files/selinux/fedmsg.pp (100%) rename roles/{fedmsg_base => fedmsg/base}/files/selinux/fedmsg.te (100%) rename roles/{fedmsg_base => fedmsg/base}/tasks/main.yml (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/base.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/endpoints-fedbadges.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/endpoints-fedocal.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/endpoints-mailman.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/endpoints-nuancier.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/endpoints-summershum.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/endpoints.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/logging.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/pkgdb.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/policy.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/relay.py.j2 (100%) rename roles/{fedmsg_base => fedmsg/base}/templates/ssl.py.j2 (100%) rename roles/{fedmsg-hub => fedmsg/hub}/tasks/main.yml (100%) diff --git a/inventory/group_vars/ask b/inventory/group_vars/ask index 0a1e2d2590..f9732c40db 100644 --- a/inventory/group_vars/ask +++ b/inventory/group_vars/ask @@ -10,7 +10,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/ask-stg b/inventory/group_vars/ask-stg index 0a1e2d2590..f9732c40db 100644 --- a/inventory/group_vars/ask-stg +++ b/inventory/group_vars/ask-stg @@ -10,7 +10,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/badges-backend b/inventory/group_vars/badges-backend index 9e08d12f01..27ca02c31f 100644 --- a/inventory/group_vars/badges-backend +++ b/inventory/group_vars/badges-backend @@ -11,7 +11,7 @@ tcp_ports: [ 3000 ] fas_client_groups: sysadmin-noc,sysadmin-badges -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/badges-backend-stg b/inventory/group_vars/badges-backend-stg index 68048f4a7d..3addb61a2a 100644 --- a/inventory/group_vars/badges-backend-stg +++ b/inventory/group_vars/badges-backend-stg @@ -11,7 +11,7 @@ tcp_ports: [ 3000 ] fas_client_groups: sysadmin-noc,sysadmin-badges -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/badges-web b/inventory/group_vars/badges-web index 2013068129..f72d2176e9 100644 --- a/inventory/group_vars/badges-web +++ b/inventory/group_vars/badges-web @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-badges -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/badges-web-stg b/inventory/group_vars/badges-web-stg index b2f4fe3316..62566a286a 100644 --- a/inventory/group_vars/badges-web-stg +++ b/inventory/group_vars/badges-web-stg @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-badges -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/bodhi b/inventory/group_vars/bodhi index 6c9de642b9..b7b745f9bb 100644 --- a/inventory/group_vars/bodhi +++ b/inventory/group_vars/bodhi @@ -17,7 +17,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/bodhi-stg b/inventory/group_vars/bodhi-stg index 6c9de642b9..b7b745f9bb 100644 --- a/inventory/group_vars/bodhi-stg +++ b/inventory/group_vars/bodhi-stg @@ -17,7 +17,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/fedocal b/inventory/group_vars/fedocal index 540139a506..cedc7f0e96 100644 --- a/inventory/group_vars/fedocal +++ b/inventory/group_vars/fedocal @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-web -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/fedocal-stg b/inventory/group_vars/fedocal-stg index 23e26b7aa5..91176e21f1 100644 --- a/inventory/group_vars/fedocal-stg +++ b/inventory/group_vars/fedocal-stg @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-web -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/mailman b/inventory/group_vars/mailman index be7c2b61ae..59c446af6b 100644 --- a/inventory/group_vars/mailman +++ b/inventory/group_vars/mailman @@ -9,7 +9,7 @@ num_cpus: 2 tcp_ports: [ 25, 80, 443 ] fas_client_groups: sysadmin-tools,sysadmin-main -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/mailman-stg b/inventory/group_vars/mailman-stg index 62acb4eacb..1e0b57b5ea 100644 --- a/inventory/group_vars/mailman-stg +++ b/inventory/group_vars/mailman-stg @@ -9,7 +9,7 @@ num_cpus: 2 tcp_ports: [ 25, 80, 443 ] fas_client_groups: sysadmin-tools,sysadmin-main -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/nuancier b/inventory/group_vars/nuancier index 10749d90ea..2327a34357 100644 --- a/inventory/group_vars/nuancier +++ b/inventory/group_vars/nuancier @@ -16,7 +16,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-web -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/nuancier-stg b/inventory/group_vars/nuancier-stg index fcaa9e6040..a44616345b 100644 --- a/inventory/group_vars/nuancier-stg +++ b/inventory/group_vars/nuancier-stg @@ -16,7 +16,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-web -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/packages b/inventory/group_vars/packages index 810f6793dd..124f8ea9db 100644 --- a/inventory/group_vars/packages +++ b/inventory/group_vars/packages @@ -16,7 +16,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-web -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/packages-stg b/inventory/group_vars/packages-stg index 24cf54671f..5d5fe97544 100644 --- a/inventory/group_vars/packages-stg +++ b/inventory/group_vars/packages-stg @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-web -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/pkgdb b/inventory/group_vars/pkgdb index c72398230d..9f7bd215b9 100644 --- a/inventory/group_vars/pkgdb +++ b/inventory/group_vars/pkgdb @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-web -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/pkgdb-stg b/inventory/group_vars/pkgdb-stg index 3894f0294a..03a9c830a2 100644 --- a/inventory/group_vars/pkgdb-stg +++ b/inventory/group_vars/pkgdb-stg @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc,sysadmin-web -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/summershum b/inventory/group_vars/summershum index b6a60f2fd7..d5b76e67a0 100644 --- a/inventory/group_vars/summershum +++ b/inventory/group_vars/summershum @@ -11,7 +11,7 @@ tcp_ports: [ 3000 ] fas_client_groups: sysadmin-noc,sysadmin-badges -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/summershum-stg b/inventory/group_vars/summershum-stg index b6a60f2fd7..d5b76e67a0 100644 --- a/inventory/group_vars/summershum-stg +++ b/inventory/group_vars/summershum-stg @@ -11,7 +11,7 @@ tcp_ports: [ 3000 ] fas_client_groups: sysadmin-noc,sysadmin-badges -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/tagger b/inventory/group_vars/tagger index e57eddf949..29425ea3ed 100644 --- a/inventory/group_vars/tagger +++ b/inventory/group_vars/tagger @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/group_vars/tagger-stg b/inventory/group_vars/tagger-stg index efc4a634a3..e8cd77d765 100644 --- a/inventory/group_vars/tagger-stg +++ b/inventory/group_vars/tagger-stg @@ -14,7 +14,7 @@ tcp_ports: [ 80, 443, fas_client_groups: sysadmin-noc -# These are consumed by a task in roles/fedmsg_base/main.yml +# These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell owner: root diff --git a/inventory/host_vars/209.132.184.142 b/inventory/host_vars/209.132.184.142 index bcda21c3e2..24c54602e9 100644 --- a/inventory/host_vars/209.132.184.142 +++ b/inventory/host_vars/209.132.184.142 @@ -10,9 +10,9 @@ root_auth_users: bkabrda msuchy pingou msuchy sgallagh nb description: copr dispatcher and repo server volumes: ['-d /dev/vdc vol-00000028'] -# These are *usually* consumed by a task in roles/fedmsg_base/tasks/main.yml +# These are *usually* consumed by a task in roles/fedmsg/base/tasks/main.yml # but since copr-be is an openstack node, it doesn't have a well-defined -# ansible_fqdn. This makes the fedmsg_base role a little crazy. Instead, we +# ansible_fqdn. This makes the fedmsg/base role a little crazy. Instead, we # copy the certs explicitly in the copr-be playbook. #fedmsg_certs: #- service: copr-backend diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index 56ed80d359..f628a593c3 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -35,7 +35,7 @@ - fas_client - collectd - ask - - fedmsg_base + - fedmsg/base tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 022e3e4769..07dbf05804 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -37,7 +37,7 @@ - denyhosts - nagios_client - fas_client - - fedmsg_base + - fedmsg/base tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index fa0dec9b81..ef970cc6c5 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -38,7 +38,7 @@ - nagios_client - fas_client - badges-frontend - - fedmsg_base + - fedmsg/base tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml index 528cf710b4..bc25e4aa84 100644 --- a/playbooks/groups/bodhi.yml +++ b/playbooks/groups/bodhi.yml @@ -34,7 +34,7 @@ - { role: bodhi/base, when: "inventory_hostname.startswith('bodhi01') or inventory_hostname.startswith('bodhi02')" } - { role: bodhi/masher, jobrunner: true, when: "inventory_hostname.startswith('releng04')" } - { role: bodhi/masher, epelmasher: true, when: "inventory_hostname.startswith('relepel01')" } - - fedmsg_base + - fedmsg/base tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index cb9ba4e356..67f9725ce3 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -64,7 +64,7 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - - fedmsg_base + - fedmsg/base handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index ef8cff1588..c31cd7c997 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -37,7 +37,7 @@ - denyhosts - nagios_client - fas_client - - fedmsg_base + - fedmsg/base tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 860f82475c..ef2fb9c7d0 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -37,7 +37,7 @@ - denyhosts - nagios_client - fas_client - - fedmsg_base + - fedmsg/base tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index debf132373..4a2e5bd40d 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -120,7 +120,7 @@ mailman_hk_db_pass: "{{ mailman_hk_db_pass }}" mailman_ks_admin_db_pass: "{{ mailman_ks_admin_db_pass }}" mailman_ks_db_pass: "{{ mailman_ks_db_pass }}" - - fedmsg_base + - fedmsg/base tasks: - name: install more needed packages diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index b3d159a144..e3e6fd43d0 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -37,7 +37,7 @@ - denyhosts - nagios_client - fas_client - - fedmsg_base + - fedmsg/base tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index d51c7e7738..5d88d7144e 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -37,7 +37,7 @@ - denyhosts - nagios_client - fas_client - - fedmsg_base + - fedmsg/base - notifs-frontend tasks: diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 69d51d1797..88debf8bb2 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -64,7 +64,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - fedmsg_base + - fedmsg/base handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 5be2728d61..7bd87b96a5 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -113,7 +113,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - fedmsg_base + - fedmsg/base - packages handlers: diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index fb450c77bb..5bcd9e0b04 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -64,7 +64,7 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - - fedmsg_base + - fedmsg/base handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index fd0f483123..f35592f7ab 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -64,7 +64,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - fedmsg_base + - fedmsg/base handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index edf6ac7c87..b12aa4f8a6 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -82,7 +82,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - fedmsg_base + - fedmsg/base handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml index 8f6ca087e7..cc0ff488f1 100644 --- a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml @@ -23,7 +23,7 @@ # Roles are run first, before tasks, regardless of where you place them here. roles: - - fedmsg_base + - fedmsg/base tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/roles/fedmsg_base/files/selinux/fedmsg.mod b/roles/fedmsg/base/files/selinux/fedmsg.mod similarity index 100% rename from roles/fedmsg_base/files/selinux/fedmsg.mod rename to roles/fedmsg/base/files/selinux/fedmsg.mod diff --git a/roles/fedmsg_base/files/selinux/fedmsg.pp b/roles/fedmsg/base/files/selinux/fedmsg.pp similarity index 100% rename from roles/fedmsg_base/files/selinux/fedmsg.pp rename to roles/fedmsg/base/files/selinux/fedmsg.pp diff --git a/roles/fedmsg_base/files/selinux/fedmsg.te b/roles/fedmsg/base/files/selinux/fedmsg.te similarity index 100% rename from roles/fedmsg_base/files/selinux/fedmsg.te rename to roles/fedmsg/base/files/selinux/fedmsg.te diff --git a/roles/fedmsg_base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml similarity index 100% rename from roles/fedmsg_base/tasks/main.yml rename to roles/fedmsg/base/tasks/main.yml diff --git a/roles/fedmsg_base/templates/base.py.j2 b/roles/fedmsg/base/templates/base.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/base.py.j2 rename to roles/fedmsg/base/templates/base.py.j2 diff --git a/roles/fedmsg_base/templates/endpoints-fedbadges.py.j2 b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/endpoints-fedbadges.py.j2 rename to roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 diff --git a/roles/fedmsg_base/templates/endpoints-fedocal.py.j2 b/roles/fedmsg/base/templates/endpoints-fedocal.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/endpoints-fedocal.py.j2 rename to roles/fedmsg/base/templates/endpoints-fedocal.py.j2 diff --git a/roles/fedmsg_base/templates/endpoints-mailman.py.j2 b/roles/fedmsg/base/templates/endpoints-mailman.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/endpoints-mailman.py.j2 rename to roles/fedmsg/base/templates/endpoints-mailman.py.j2 diff --git a/roles/fedmsg_base/templates/endpoints-nuancier.py.j2 b/roles/fedmsg/base/templates/endpoints-nuancier.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/endpoints-nuancier.py.j2 rename to roles/fedmsg/base/templates/endpoints-nuancier.py.j2 diff --git a/roles/fedmsg_base/templates/endpoints-summershum.py.j2 b/roles/fedmsg/base/templates/endpoints-summershum.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/endpoints-summershum.py.j2 rename to roles/fedmsg/base/templates/endpoints-summershum.py.j2 diff --git a/roles/fedmsg_base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/endpoints.py.j2 rename to roles/fedmsg/base/templates/endpoints.py.j2 diff --git a/roles/fedmsg_base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/logging.py.j2 rename to roles/fedmsg/base/templates/logging.py.j2 diff --git a/roles/fedmsg_base/templates/pkgdb.py.j2 b/roles/fedmsg/base/templates/pkgdb.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/pkgdb.py.j2 rename to roles/fedmsg/base/templates/pkgdb.py.j2 diff --git a/roles/fedmsg_base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/policy.py.j2 rename to roles/fedmsg/base/templates/policy.py.j2 diff --git a/roles/fedmsg_base/templates/relay.py.j2 b/roles/fedmsg/base/templates/relay.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/relay.py.j2 rename to roles/fedmsg/base/templates/relay.py.j2 diff --git a/roles/fedmsg_base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 similarity index 100% rename from roles/fedmsg_base/templates/ssl.py.j2 rename to roles/fedmsg/base/templates/ssl.py.j2 diff --git a/roles/fedmsg-hub/tasks/main.yml b/roles/fedmsg/hub/tasks/main.yml similarity index 100% rename from roles/fedmsg-hub/tasks/main.yml rename to roles/fedmsg/hub/tasks/main.yml