From: Ken Dreyer Date: Tue, 19 May 2015 23:50:00 +0000 (-0600) Subject: puddle: use distill configs from rcm-metadata.git X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b61ffeabfc37d34017ee2529cae64c714940a5e1;p=ceph-cm-ansible.git puddle: use distill configs from rcm-metadata.git Originally I thought that we could store each of distill's individual configuration files in ceph-cm-ansible.git, but this is becoming untenable because there are too many templated values, and I'm trying to sync these files closely with the copies from Red Hat's rel-eng team. This commit uses the git module to clone a rcm-metadata.git repository to /etc/distill and alters the "ceph-distill" wrapper script to use that location instead. Since the individual templated files are no longer needed (the full versions are in rcm-metadata.git), delete them from the tree here. --- diff --git a/roles/puddle/defaults/main.yml b/roles/puddle/defaults/main.yml index 18c7c2c..5deca79 100644 --- a/roles/puddle/defaults/main.yml +++ b/roles/puddle/defaults/main.yml @@ -26,7 +26,4 @@ puddle: announcer: '' distill: - brewhub_url: '' - rhel_7_lookaside_repo_x86_64_url: '' - rhel_7_lookaside_repo_src_url: '' - email: '' + rcm_metadata_repo: '' diff --git a/roles/puddle/tasks/distill/configure.yml b/roles/puddle/tasks/distill/configure.yml index 0f0de81..1cc53dc 100644 --- a/roles/puddle/tasks/distill/configure.yml +++ b/roles/puddle/tasks/distill/configure.yml @@ -1,24 +1,19 @@ --- - name: add ceph distill config dir file: - path: /etc/distill/ceph + path: /etc/distill/ owner: root group: root mode: 0755 state: directory -- name: add distill config files - template: - src: "../../templates/distill/{{ item }}" - dest: "/etc/distill/ceph/{{ item }}" - owner: root - group: root - mode: 0644 - with_items: - - ceph-1.3-rhel-7.conf - - comps-ceph-1.3-rhel-7.xml - - run-distill.conf - - variants-ceph-1.3-rhel-7.xml +# 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 # distill requires this symlink in order to run. - name: symlink /mnt/brew diff --git a/roles/puddle/templates/distill/ceph-1.3-rhel-7.conf b/roles/puddle/templates/distill/ceph-1.3-rhel-7.conf deleted file mode 100644 index f3eab92..0000000 --- a/roles/puddle/templates/distill/ceph-1.3-rhel-7.conf +++ /dev/null @@ -1,65 +0,0 @@ -# -# {{ ansible_managed }} -# - -# PRODUCT INFO -product_name = "Red Hat Ceph" -product_short = "Ceph" -product_version = "1.3" -product_is_layered = True - - -# BASE PRODUCT INFO (FOR A LAYERED PRODUCT ONLY) -base_product_short = "RHEL" -base_product_version = "7" -base_product_name = "Red Hat Enterprise Linux" - - -# GENERAL SETTINGS -bootable = False -comps_file = "comps-ceph-1.3-rhel-7.xml" -variants_file = "variants-ceph-1.3-rhel-7.xml" - -# FD431D51 = redhatrelease2 (rhel6+ gold key) -# F21541EB = beta2 (rhel6+ beta key) -# None = unsigned -sigkeys = ["FD431D51", "F21541EB", None] - - -multilib_arches = ["x86_64"] -multilib_methods = [] # devel (recommended), all, base, file, kernel, none, runtime - - -# RUNROOT SETTINGS -runroot = False - - -# PKGSET -pkgset_source = "koji" # koji, repos - -# PKGSET - REPOS -# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]} -# pkgset_repos = {} - -# PKGSET - KOJI -pkgset_koji_path_prefix = "/mnt/brew" -pkgset_koji_url = "{{ distill.brewhub_url }}" -pkgset_koji_tag = "ceph-1.3-rhel-7-candidate" - - -# GATHER -gather_method = "deps" # deps, nodeps -gather_source = "comps" # comps, json, none -check_deps = False -# variant ID regex: arch: packages -gather_lookaside_repos = [ - ("^.*$", { - "x86_64": [ - "{{ distill.rhel_7_lookaside_repo_x86_64_url }}", - "{{ distill.rhel_7_lookaside_repo_src_url }}", - ], - }), -] - - -createrepo_c = True diff --git a/roles/puddle/templates/distill/ceph-distill b/roles/puddle/templates/distill/ceph-distill index 510b5a8..4baee1a 100755 --- a/roles/puddle/templates/distill/ceph-distill +++ b/roles/puddle/templates/distill/ceph-distill @@ -10,8 +10,8 @@ # The general idea is to make sure we don't run out of disk space on our VM. -cd /etc/distill/ceph -run-distill el7-test +cd /etc/distill/rcm-metadata/distill_ng/ceph +run-distill test set -e diff --git a/roles/puddle/templates/distill/comps-ceph-1.3-rhel-7.xml b/roles/puddle/templates/distill/comps-ceph-1.3-rhel-7.xml deleted file mode 100644 index c6f9d02..0000000 --- a/roles/puddle/templates/distill/comps-ceph-1.3-rhel-7.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - calamari - Red Hat Ceph Calamari - Red Hat Ceph Calamari packages - true - true - - calamari-clients - calamari-servers - salt-master - zeromq3-devel - - - - - ceph-installer - Red Hat Ceph Installer - Red Hat Ceph Installer packages - true - true - - ceph-deploy - - - - - ceph-mon - Red Hat Ceph Monitor - Red Hat Ceph Monitor packages - true - true - - ceph-mon - diamond - librados2-devel - librbd1-devel - salt-minion - - - - - ceph-osd - Red Hat Ceph OSD - Red Hat Ceph Object Storage Daemon packages - true - true - - ceph-osd - diamond - librados2-devel - librbd1-devel - salt-minion - - - - diff --git a/roles/puddle/templates/distill/run-distill.conf b/roles/puddle/templates/distill/run-distill.conf deleted file mode 100644 index 862ced5..0000000 --- a/roles/puddle/templates/distill/run-distill.conf +++ /dev/null @@ -1,54 +0,0 @@ -# -# This file is managed by ansible, don't make changes here - they will be overwritten. -# - -[el7] -config = ceph-1.3-rhel-7.conf -compose_type = production -target = /mnt/redhat/devel/candidate-trees -no_label = 0 -kerberos = 0 -kerberos_keytab = /etc/distill.$HOSTNAME.keytab -kerberos_principal = distill/$HOSTNAME -skip_phase = -just_phase = -changelogs = 0 -composedb = 0 -notification = 0 -email = kdreyer@redhat.com -pre_compose_script = -post_compose_script = - -[el7-nightly] -config = ceph-1.3-rhel-7.conf -compose_type = nightly -target = /mnt/redhat/nightly -no_label = 1 -kerberos = 0 -kerberos_keytab = /etc/distill.$HOSTNAME.keytab -kerberos_principal = distill/$HOSTNAME -skip_phase = -just_phase = -changelogs = 0 -composedb = 0 -notification = 0 -email = {{ distill.email }} -pre_compose_script = -post_compose_script = - -[el7-test] -config = ceph-1.3-rhel-7.conf -compose_type = test -target = /var/www/{{ ansible_hostname }}/htdocs/distill/1.3-candidate-trees -no_label = 1 -kerberos = 0 -kerberos_keytab = /etc/distill.$HOSTNAME.keytab -kerberos_principal = distill/$HOSTNAME -skip_phase = -just_phase = -changelogs = 0 -composedb = 0 -notification = 0 -email = {{ distill.email }} -pre_compose_script = -post_compose_script = compose-create-unified-isos $COMPOSE_PATH diff --git a/roles/puddle/templates/distill/variants-ceph-1.3-rhel-7.xml b/roles/puddle/templates/distill/variants-ceph-1.3-rhel-7.xml deleted file mode 100644 index 83dc299..0000000 --- a/roles/puddle/templates/distill/variants-ceph-1.3-rhel-7.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - x86_64 - - - calamari - - - - - - x86_64 - - - ceph-installer - - - - - - x86_64 - - - ceph-mon - - - - - - x86_64 - - - ceph-osd - - - -