From: Ken Dreyer Date: Thu, 20 Apr 2023 21:13:56 +0000 (-0400) Subject: remove puddle playbook and role X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e71e5a71cc4d07b2c3b6cf7c744ee17d18879686;p=ceph-cm-ansible.git remove puddle playbook and role This (internal) host is retired. --- diff --git a/puddle.yml b/puddle.yml deleted file mode 100644 index d339368..0000000 --- a/puddle.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: puddle - roles: - - common - - puddle diff --git a/roles/puddle/defaults/main.yml b/roles/puddle/defaults/main.yml deleted file mode 100644 index 459a5ff..0000000 --- a/roles/puddle/defaults/main.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# The name of the unprivileged user that will run puddle -puddle_user: puddle - -puddle: - eng_rhel_7_candidate_repo_url: '' - eng_rhel_7_repo_url: '' - mnt_redhat_nfs_src: '' - brewroot_url: '' - topurl: '' - rhel_7_server_repo_url: '' - rhel_7_common_server_repo_url: '' - rhel_7_scl_repo_url: '' - rhel_7_ceph_calamari_1_2_repo_url: '' - rhel_7_ceph_installer_1_2_repo_url: '' - rhel_7_ceph_mon_1_2_repo_url: '' - rhel_7_ceph_osd_1_2_repo_url: '' - rhel_6_server_repo_url: '' - rhel_6_common_server_repo_url: '' - rhel_6_ceph_calamari_1_2_repo_url: '' - rhel_6_ceph_installer_1_2_repo_url: '/' - rhel_6_ceph_mon_1_2_repo_url: '' - rhel_6_ceph_osd_1_2_repo_url: '' - kerberos_keytab: '' - kerberos_principal: '' - emails: '' - announcer: '' - -distill: - rcm_metadata_repo: '' diff --git a/roles/puddle/handlers/main.yml b/roles/puddle/handlers/main.yml deleted file mode 100644 index c6a5805..0000000 --- a/roles/puddle/handlers/main.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- - -- name: restart nginx - service: - name: nginx - state: restarted - -- name: restart faucet - service: - name: faucet - state: restarted - -- name: restart rsyncd - service: - name: rsyncd - state: restarted diff --git a/roles/puddle/meta/main.yml b/roles/puddle/meta/main.yml deleted file mode 100644 index 313fd69..0000000 --- a/roles/puddle/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: secrets diff --git a/roles/puddle/tasks/configure.yml b/roles/puddle/tasks/configure.yml deleted file mode 100644 index 57c3d35..0000000 --- a/roles/puddle/tasks/configure.yml +++ /dev/null @@ -1,60 +0,0 @@ ---- -- name: add ceph puddle config dir - file: - path: /etc/puddle/ceph - owner: root - group: root - mode: 0755 - state: directory - -- name: add ceph puddle config files - template: - src: "{{ item }}.conf" - dest: "/etc/puddle/ceph/{{ item }}.conf" - owner: root - group: root - mode: 0644 - with_items: - - ceph-1.2-rhel-6 - - ceph-1.2-rhel-6-async - - ceph-1.2-rhel-7 - - ceph-1.2-rhel-7-async - - rh-common-rhel-6 - - rh-common-rhel-7 - - ceph-1.3-rhel-7 - - ceph-1.3-rhel-7-async - - ceph-1.3.z-rhel-7 - -- name: add rcm-kerberos config file - template: - src: 'rcm-kerberos.conf' - dest: '/etc/rcm-kerberos.conf' - owner: root - group: root - mode: 0644 - -# Note: this file must be installed on the host independent of ansible. -- name: set permissions on keytab - file: - path: "{{ puddle.kerberos_keytab }}" - owner: root - group: puddle - mode: 0640 - -- name: add faucet config file - template: - src: 'faucet.conf' - dest: '/etc/puddle/faucet.conf' - owner: root - group: root - mode: 0644 - notify: - - restart faucet - -- name: add ceph wrapper script for puddle - template: - src: 'ceph-puddle' - dest: '/usr/local/bin/ceph-puddle' - owner: root - group: root - mode: 0755 diff --git a/roles/puddle/tasks/distill/configure.yml b/roles/puddle/tasks/distill/configure.yml deleted file mode 100644 index 7ca80e3..0000000 --- a/roles/puddle/tasks/distill/configure.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- name: add ceph distill config dir - file: - path: /etc/distill/ - owner: root - group: root - mode: 0755 - state: directory - -# This repository contains distill's configuration files. -- name: clone rcm-metadata.git - git: - dest: /etc/distill/rcm-metadata - repo: "{{ distill.rcm_metadata_repo }}" - update: no - version: ceph - accept_hostkey: yes - -# distill requires this symlink in order to run. -- name: symlink /mnt/brew - file: - src: /mnt/redhat/brewroot - dest: /mnt/brew - owner: root - group: root - state: link - -- name: create destinations (targets) for distill trees (composes) - file: - path: /var/www/{{ ansible_hostname }}/htdocs/distill/{{ item }}-trees - owner: "{{ puddle_user }}" - mode: 0755 - state: directory - with_items: - - 1.3-compose - -- name: add ceph wrapper script for run-distill - template: - src: '../../templates/distill/ceph-distill' - dest: '/usr/local/bin/ceph-distill' - owner: root - group: root - mode: 0755 diff --git a/roles/puddle/tasks/distill/install.yml b/roles/puddle/tasks/distill/install.yml deleted file mode 100644 index 69d9abf..0000000 --- a/roles/puddle/tasks/distill/install.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: install distill - yum: - name: "{{ item }}" - state: present - with_items: - - distill - - distill-utils diff --git a/roles/puddle/tasks/install.yml b/roles/puddle/tasks/install.yml deleted file mode 100644 index 9e52a94..0000000 --- a/roles/puddle/tasks/install.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- name: enable rel-eng repositories - template: - src: eng-rhel-7.repo - dest: /etc/yum.repos.d/eng-rhel-7.repo - owner: root - group: root - mode: 0644 - -- name: install puddle and dependencies - yum: - name: "{{ item }}" - state: present - with_items: - - puddle - - rcm-kerberos - - krb5-workstation - - kstart - -- name: Add a new unprivileged UID to run puddle - user: - name: "{{ puddle_user }}" - state: present - home: '/etc/puddle' - createhome: no - system: yes diff --git a/roles/puddle/tasks/main.yml b/roles/puddle/tasks/main.yml deleted file mode 100644 index df7f130..0000000 --- a/roles/puddle/tasks/main.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- fail: - msg: "Puddle is only relevant on RHEL" - when: ansible_distribution != 'RedHat' - -# install puddle -- import_tasks: install.yml - tags: - - install-puddle - -# configure NFS -- import_tasks: nfs.yml - -# configure puddle -- import_tasks: configure.yml - tags: - - configure-puddle - -# install and configure web server -- import_tasks: nginx.yml - tags: - - nginx - -# install and configure distill -- import_tasks: distill/install.yml - tags: - - install-distill - -- import_tasks: distill/configure.yml - tags: - - configure-distill - -# install and configure rsyncd -- import_tasks: rsync.yml - tags: - - rsync diff --git a/roles/puddle/tasks/nfs.yml b/roles/puddle/tasks/nfs.yml deleted file mode 100644 index fd8b173..0000000 --- a/roles/puddle/tasks/nfs.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- - -- name: install nfs client - yum: - name: nfs-utils - state: present - -- name: Mount /mnt/redhat - mount: - name: /mnt/redhat - src: "{{ puddle.mnt_redhat_nfs_src }}" - fstype: nfs - opts: 'ro,nosuid,nodev,hard,intr,bg,noatime,nodiratime,nfsvers=3,tcp,rsize=8192,wsize=8192' - state: mounted diff --git a/roles/puddle/tasks/nginx.yml b/roles/puddle/tasks/nginx.yml deleted file mode 100644 index a243919..0000000 --- a/roles/puddle/tasks/nginx.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- name: install nginx web server - yum: - name: nginx - state: present - -- name: create nginx docroots - file: - path: "/var/www/{{ item }}/htdocs" - owner: "{{ puddle_user }}" - mode: 0755 - state: directory - with_items: - - "dev-{{ ansible_hostname }}" - - "{{ ansible_hostname }}" - -- name: configure nginx - template: - src: nginx.conf - dest: /etc/nginx/nginx.conf - notify: - - restart nginx - -# Note: this file must be installed on the host independent of ansible. -- name: set permissions on htaccess - file: - path: '/etc/nginx/htpasswd' - owner: root - group: nginx - mode: 0640 - notify: - - restart nginx - -- name: start the nginx service - service: - name: nginx - state: started - enabled: yes diff --git a/roles/puddle/tasks/rsync.yml b/roles/puddle/tasks/rsync.yml deleted file mode 100644 index f3ac4d6..0000000 --- a/roles/puddle/tasks/rsync.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: install rsync - yum: - name: rsync - state: present - -- name: configure rsyncd - template: - src: rsyncd.conf - dest: /etc/rsyncd.conf - notify: - - restart rsyncd - -- name: start the rsyncd service - service: - name: rsyncd - state: started - enabled: yes diff --git a/roles/puddle/templates/ceph-1.2-rhel-6-async.conf b/roles/puddle/templates/ceph-1.2-rhel-6-async.conf deleted file mode 100644 index 063b217..0000000 --- a/roles/puddle/templates/ceph-1.2-rhel-6-async.conf +++ /dev/null @@ -1,37 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -errata_release = CEPH-1.2,CEPH-ASYNC -errata_whitelist = no -product_name = RHCeph -version = 1.2-RHEL-6 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = no -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[RH6-CEPH-CALAMARI-1.2] -variant = RH6-CEPH-CALAMARI-1.2 -external = {{ puddle.rhel_6_server_repo_url }} - -[RH6-CEPH-INSTALLER-1.2] -variant = RH6-CEPH-INSTALLER-1.2 -external = {{ puddle.rhel_6_server_repo_url }} - -[RH6-CEPH-MON-1.2] -variant = RH6-CEPH-MON-1.2 -external = {{ puddle.rhel_6_server_repo_url }} - -[RH6-CEPH-OSD-1.2] -variant = RH6-CEPH-OSD-1.2 -external = {{ puddle.rhel_6_server_repo_url }} diff --git a/roles/puddle/templates/ceph-1.2-rhel-6.conf b/roles/puddle/templates/ceph-1.2-rhel-6.conf deleted file mode 100644 index 89864b0..0000000 --- a/roles/puddle/templates/ceph-1.2-rhel-6.conf +++ /dev/null @@ -1,41 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -errata_release = CEPH-1.2 -errata_whitelist = no -product_name = RHCeph -version = 1.2-RHEL-6 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = yes -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[RH6-CEPH-CALAMARI-1.2] -variant = RH6-CEPH-CALAMARI-1.2 -external = {{ puddle.rhel_6_server_repo_url }} -keys = fd431d51,f21541eb - -[RH6-CEPH-INSTALLER-1.2] -variant = RH6-CEPH-INSTALLER-1.2 -external = {{ puddle.rhel_6_server_repo_url }} -keys = fd431d51,f21541eb - -[RH6-CEPH-MON-1.2] -variant = RH6-CEPH-MON-1.2 -external = {{ puddle.rhel_6_server_repo_url }} -keys = fd431d51,f21541eb - -[RH6-CEPH-OSD-1.2] -variant = RH6-CEPH-OSD-1.2 -external = {{ puddle.rhel_6_server_repo_url }} -keys = fd431d51,f21541eb diff --git a/roles/puddle/templates/ceph-1.2-rhel-7-async.conf b/roles/puddle/templates/ceph-1.2-rhel-7-async.conf deleted file mode 100644 index 0b36def..0000000 --- a/roles/puddle/templates/ceph-1.2-rhel-7-async.conf +++ /dev/null @@ -1,40 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -errata_release = CEPH-1.2,CEPH-ASYNC -product_name = RHCeph -version = 1.2-RHEL-7 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = no -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[Server-RH7-CEPH-CALAMARI-1.2] -variant = Server-RH7-CEPH-CALAMARI-1.2 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-INSTALLER-1.2] -variant = Server-RH7-CEPH-INSTALLER-1.2 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-MON-1.2] -variant = Server-RH7-CEPH-MON-1.2 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-OSD-1.2] -variant = Server-RH7-CEPH-OSD-1.2 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb diff --git a/roles/puddle/templates/ceph-1.2-rhel-7.conf b/roles/puddle/templates/ceph-1.2-rhel-7.conf deleted file mode 100644 index 5724470..0000000 --- a/roles/puddle/templates/ceph-1.2-rhel-7.conf +++ /dev/null @@ -1,41 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -errata_release = CEPH-1.2 -errata_whitelist = no -product_name = RHCeph -version = 1.2-RHEL-7 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = yes -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[Server-RH7-CEPH-CALAMARI-1.2] -variant = Server-RH7-CEPH-CALAMARI-1.2 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-INSTALLER-1.2] -variant = Server-RH7-CEPH-INSTALLER-1.2 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-MON-1.2] -variant = Server-RH7-CEPH-MON-1.2 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-OSD-1.2] -variant = Server-RH7-CEPH-OSD-1.2 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb diff --git a/roles/puddle/templates/ceph-1.3-rhel-7-async.conf b/roles/puddle/templates/ceph-1.3-rhel-7-async.conf deleted file mode 100644 index e3b5f70..0000000 --- a/roles/puddle/templates/ceph-1.3-rhel-7-async.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -errata_release = CEPH-1.3.0,CEPH-1.3.z,CEPH-ASYNC -product_name = RHCeph -version = 1.3-async-RHEL-7 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = no -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[Server-RH7-CEPH-CALAMARI-1.3] -variant = Server-RH7-CEPH-CALAMARI-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-INSTALLER-1.3] -variant = Server-RH7-CEPH-INSTALLER-1.3 -external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_scl_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-MON-1.3] -variant = Server-RH7-CEPH-MON-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-OSD-1.3] -variant = Server-RH7-CEPH-OSD-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-TOOLS-1.3] -variant = Server-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Client-RH7-CEPH-TOOLS-1.3] -variant = Client-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_client_repo_url }} -keys = fd431d51,f21541eb - -[ComputeNode-RH7-CEPH-TOOLS-1.3] -variant = ComputeNode-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_computenode_repo_url }} -keys = fd431d51,f21541eb - -[Workstation-RH7-CEPH-TOOLS-1.3] -variant = Workstation-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_workstation_repo_url }} -keys = fd431d51,f21541eb diff --git a/roles/puddle/templates/ceph-1.3-rhel-7.conf b/roles/puddle/templates/ceph-1.3-rhel-7.conf deleted file mode 100644 index a65d6f3..0000000 --- a/roles/puddle/templates/ceph-1.3-rhel-7.conf +++ /dev/null @@ -1,47 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -errata_release = CEPH-1.3.0 -errata_whitelist = no -errata_blacklist = no -product_name = RHCeph -version = 1.3-RHEL-7 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = no -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[Server-RH7-CEPH-CALAMARI-1.3] -variant = Server-RH7-CEPH-CALAMARI-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-INSTALLER-1.3] -variant = Server-RH7-CEPH-INSTALLER-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-MON-1.3] -variant = Server-RH7-CEPH-MON-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-OSD-1.3] -variant = Server-RH7-CEPH-OSD-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-TOOLS-1.3] -variant = Server-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb diff --git a/roles/puddle/templates/ceph-1.3.z-rhel-7.conf b/roles/puddle/templates/ceph-1.3.z-rhel-7.conf deleted file mode 100644 index 0c2cf01..0000000 --- a/roles/puddle/templates/ceph-1.3.z-rhel-7.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -errata_release = CEPH-1.3.0,CEPH-1.3.z,CEPH-ASYNC -product_name = RHCeph -version = 1.3.2-RHEL-7 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = no -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[Server-RH7-CEPH-CALAMARI-1.3] -variant = Server-RH7-CEPH-CALAMARI-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-INSTALLER-1.3] -variant = Server-RH7-CEPH-INSTALLER-1.3 -external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_scl_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-MON-1.3] -variant = Server-RH7-CEPH-MON-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-OSD-1.3] -variant = Server-RH7-CEPH-OSD-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Server-RH7-CEPH-TOOLS-1.3] -variant = Server-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_server_repo_url }} -keys = fd431d51,f21541eb - -[Client-RH7-CEPH-TOOLS-1.3] -variant = Client-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_client_repo_url }} -keys = fd431d51,f21541eb - -[ComputeNode-RH7-CEPH-TOOLS-1.3] -variant = ComputeNode-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_computenode_repo_url }} -keys = fd431d51,f21541eb - -[Workstation-RH7-CEPH-TOOLS-1.3] -variant = Workstation-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_workstation_repo_url }} -keys = fd431d51,f21541eb diff --git a/roles/puddle/templates/ceph-puddle b/roles/puddle/templates/ceph-puddle deleted file mode 100755 index b23fa04..0000000 --- a/roles/puddle/templates/ceph-puddle +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# -# {{ ansible_managed }} -# - -# In order to allow Puddle to communicate with Red Hat's Errata Tool, we need -# active Kerberos credentials. This script wraps /usr/bin/puddle with the -# k5start utility. - -set -e - -exec k5start -U -f {{ puddle.kerberos_keytab }} -- puddle "$@" diff --git a/roles/puddle/templates/distill/ceph-distill b/roles/puddle/templates/distill/ceph-distill deleted file mode 100755 index 3a2ce84..0000000 --- a/roles/puddle/templates/distill/ceph-distill +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# -# {{ ansible_managed }} -# - -# Distill's output is very large. This script wraps "run-distill" and does a -# bit of tidying up afterwards. It removes a lot of the files that we don't -# use, and it even deletes older composes. - -# The general idea is to make sure we don't run out of disk space on our VM. - -cd /etc/distill/rcm-metadata/distill_ng/ceph -run-distill test - -set -e - -# Keep this many old composes around. -keep=20 - -# $compose_config is this is the directory in htdocs that we want to clean up. -compose_config=1.3-compose-trees - -# Eventually we will want to refactor the rest of this script into a function -# and loop over more compose_configs here. - -target=/var/www/{{ ansible_hostname }}/htdocs/distill/$compose_config - -# Cleanup temporary files that we don't need and take up space -pushd $target/latest-Ceph-1-RHEL-7 - # Temporary work directory; not usuable by QE. - rm -r work - # These repos are not relevant. Just save the "Installer" repo. - rm -r compose/{Calamari,MON,OSD} - pushd compose/Installer - # Remove more things that we don't need - rm -r x86_64/{debug,os}/ - rm -r source/tree/ - # We are now left with two single "unified" ISOs in /x86_64 and in /source. - popd # compose/Installer -popd # $target - -# Remove composes older than $keep number. -for old in $(ls -d $target/Ceph* | tail -n +${keep}); do - rm -r $old -done diff --git a/roles/puddle/templates/eng-rhel-7.repo b/roles/puddle/templates/eng-rhel-7.repo deleted file mode 100644 index ffa5c67..0000000 --- a/roles/puddle/templates/eng-rhel-7.repo +++ /dev/null @@ -1,15 +0,0 @@ -# -# {{ ansible_managed }} -# - -[eng-rhel-7] -name=Rel-Eng Packages for RHEL 7 - $basearch -baseurl={{ puddle.eng_rhel_7_repo_url }} -gpgcheck=0 -enabled=1 - -[eng-rhel-7-candidate] -name=Rel-Eng Packages for RHEL 7 - Testing - $basearch -baseurl={{ puddle.eng_rhel_7_candidate_repo_url }} -gpgcheck=0 -enabled=1 diff --git a/roles/puddle/templates/faucet.conf b/roles/puddle/templates/faucet.conf deleted file mode 100644 index ab0ef05..0000000 --- a/roles/puddle/templates/faucet.conf +++ /dev/null @@ -1,25 +0,0 @@ -[main] -log = /var/log/faucet.log - -[ceph-1.3-rhel-7] -email = no -config = /etc/puddle/ceph/ceph-1.3-rhel-7.conf -window = 5 -# Once RT #345524 is completed, use "brew" with the -pending tag instead of -# "errata". -errata = 20313 -#brew = ceph-1.3-rhel-7-pending - -[ceph-1.2-rhel-7] -email = no -config = /etc/puddle/ceph/ceph-1.2-rhel-7.conf -window = 5 -# TODO: file RT ticket for sync_brew_with_errata with ceph-1.2 tags -brew = ceph-1.2-rhel-7-pending - -[ceph-1.2-rhel-6] -email = no -config = /etc/puddle/ceph/ceph-1.2-rhel-6.conf -window = 5 -# TODO: file RT ticket for sync_brew_with_errata with ceph-1.2 tags -brew = ceph-1.2-rhel-6-pending diff --git a/roles/puddle/templates/nginx.conf b/roles/puddle/templates/nginx.conf deleted file mode 100644 index 2652703..0000000 --- a/roles/puddle/templates/nginx.conf +++ /dev/null @@ -1,114 +0,0 @@ -# -# {{ ansible_managed }} -# - -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes 1; - -error_log /var/log/nginx/error.log; -#error_log /var/log/nginx/error.log notice; -#error_log /var/log/nginx/error.log info; - -pid /run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - index index.html index.htm; - - server_tokens off; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; - - server { - listen 80 default_server; - listen [::]:80 default_server; - listen 443 default_server ssl; - server_name localhost; - root /var/www/{{ ansible_hostname }}/htdocs; - - ssl_certificate /etc/pki/tls/certs/{{ ansible_fqdn }}-bundled.crt; - ssl_certificate_key /etc/pki/tls/private/{{ ansible_fqdn }}.key; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - - location / { - autoindex on; - autoindex_exact_size off; - } - - # Some of distill's files have no suffix and are simply plaintext. - location ~ (COMPOSE_ID|STATUS)$ { - default_type text/plain; - } - - types { - # Plaintext files from puddle and distill: - text/plain conf log repo txt; - # More from distill: - text/plain manifest MD5SUM SHA1SUM SHA256SUM; - } - - # Online Ubuntu repos - location /ubuntu/ { - autoindex on; - autoindex_exact_size off; - if ($scheme != "https") { - rewrite ^ https://$host$uri permanent; - } - auth_basic "Restricted"; - auth_basic_user_file /etc/nginx/htpasswd; - } - } - - server { - listen 80; - listen [::]:80; - server_name dev-{{ ansible_fqdn }}; - root /var/www/dev-{{ ansible_hostname }}/htdocs; - - location / { - autoindex on; - autoindex_exact_size off; - } - - # Some of distill's files have no suffix and are simply plaintext. - location ~ (COMPOSE_ID|STATUS)$ { - default_type text/plain; - } - - types { - # Plaintext files from puddle and distill: - text/plain conf log repo txt; - # More from distill: - text/plain manifest MD5SUM SHA1SUM SHA256SUM; - } - } -} diff --git a/roles/puddle/templates/rcm-kerberos.conf b/roles/puddle/templates/rcm-kerberos.conf deleted file mode 100644 index 5dea048..0000000 --- a/roles/puddle/templates/rcm-kerberos.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# {{ ansible_managed }} -# - -[default] -keytab = {{ puddle.kerberos_keytab }} -principal = {{ puddle.kerberos_principal }} diff --git a/roles/puddle/templates/rh-common-rhel-6.conf b/roles/puddle/templates/rh-common-rhel-6.conf deleted file mode 100644 index 0c60e02..0000000 --- a/roles/puddle/templates/rh-common-rhel-6.conf +++ /dev/null @@ -1,26 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -#errata_release = RH-Common-ASYNC -errata_release = no -errata_whitelist = 20902,21479,21623 -product_name = RHEL-6-Server-RH-Common -version = 6.5 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = no -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[rh-common-rhel-6.5] -variant = RH-Common -external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_common_server_repo_url }} diff --git a/roles/puddle/templates/rh-common-rhel-7.conf b/roles/puddle/templates/rh-common-rhel-7.conf deleted file mode 100644 index 005667f..0000000 --- a/roles/puddle/templates/rh-common-rhel-7.conf +++ /dev/null @@ -1,26 +0,0 @@ -# -# {{ ansible_managed }} -# - -[puddle] -type = errata -#errata_release = RH-Common-ASYNC -errata_release = no -errata_whitelist = 20902,21623 -product_name = RHEL-7-RH-Common -version = 7.1 -rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles -emails = {{ puddle.emails }} -signed = no -rhndir = no -mashroot = /tmp/mash/ceph -brewroot = {{ puddle.brewroot_url }} -topurl = {{ puddle.topurl }}/puddles -announcer = {{ puddle.announcer }} -publish = no -cdndir = no - - -[rh-common-rhel-7.1] -variant = Server-RH-Common -external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_common_server_repo_url }} diff --git a/roles/puddle/templates/rsyncd.conf b/roles/puddle/templates/rsyncd.conf deleted file mode 100644 index 84121bc..0000000 --- a/roles/puddle/templates/rsyncd.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# {{ ansible_managed }} -# - - uid = nobody - gid = nobody - use chroot = yes - max connections = 64 - -[ubuntu] - path = /var/www/{{ ansible_hostname }}/htdocs/ubuntu - comment = ceph ubuntu packages