diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-06-02 08:40:27 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-06-02 13:56:08 +0000 |
commit | 02faf51e91a8c55adfbb6d953bca354ab99bf261 (patch) | |
tree | eff61e6fe9bb3adcf254c4e86eebca7190c65cce /distbuild | |
parent | 65ddf13f13ab68c1c5728e40dd81f1e8826ab0cf (diff) | |
download | definitions-02faf51e91a8c55adfbb6d953bca354ab99bf261.tar.gz |
Move all the directories used for install-files into a subdirectorybaserock/adamcoldrick/all-exts-in-definitions-v2
Change-Id: I309c183ce8b9ff9d0f5ac4807244547f2cc4ddf5
Diffstat (limited to 'distbuild')
17 files changed, 0 insertions, 277 deletions
diff --git a/distbuild/lib/systemd/system-generators/ccache-nfs-mount-generator b/distbuild/lib/systemd/system-generators/ccache-nfs-mount-generator deleted file mode 100755 index 127bc84f..00000000 --- a/distbuild/lib/systemd/system-generators/ccache-nfs-mount-generator +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -read trove_host </etc/trove-host -while read line; do echo "$line"; done >"$1/srv-distbuild-ccache.mount" <<EOF -[Unit] -Requires=rpcbind.service -After=rpcbind.service -SourcePath=/etc/trove-host - -[Mount] -Type=nfs -What=$trove_host:/home/cache/ccache -Where=/srv/distbuild/ccache - -[Install] -WantedBy=morph-worker.service -EOF diff --git a/distbuild/manifest b/distbuild/manifest deleted file mode 100644 index 9363fa85..00000000 --- a/distbuild/manifest +++ /dev/null @@ -1,28 +0,0 @@ -0040755 0 0 /lib -0040755 0 0 /lib/systemd -0040755 0 0 /lib/systemd/system-generators -0100755 0 0 /lib/systemd/system-generators/ccache-nfs-mount-generator -0040755 0 0 /usr -0040755 0 0 /usr/lib -0040755 0 0 /usr/lib/distbuild-setup -0040755 0 0 /usr/lib/distbuild-setup/ansible -0100644 0 0 /usr/lib/distbuild-setup/ansible/hosts -0100644 0 0 /usr/lib/distbuild-setup/ansible/distbuild-setup.yml -0040755 0 0 /usr/lib/systemd -0040755 0 0 /usr/lib/systemd/system -0100644 0 0 /usr/lib/systemd/system/morph-cache-server.service -0100644 0 0 /usr/lib/systemd/system/morph-controller.service -0100644 0 0 /usr/lib/systemd/system/morph-controller-helper.service -0100644 0 0 /usr/lib/systemd/system/morph-worker.service -0100644 0 0 /usr/lib/systemd/system/morph-worker-helper.service -0100644 0 0 /usr/lib/systemd/system/distbuild-setup.service -0040755 0 0 /usr/lib/systemd/system/multi-user.target.wants -0120644 0 0 /usr/lib/systemd/system/multi-user.target.wants/distbuild-setup.service -0040755 0 0 /usr/share -0040755 0 0 /usr/share/distbuild-setup -0100644 0 0 /usr/share/distbuild-setup/morph.conf -0100644 0 0 /usr/share/distbuild-setup/morph-cache-server.conf -0100644 0 0 /usr/share/distbuild-setup/morph-controller.conf -0100644 0 0 /usr/share/distbuild-setup/morph-controller-helper.conf -0100644 0 0 /usr/share/distbuild-setup/morph-worker.conf -0100644 0 0 /usr/share/distbuild-setup/morph-worker-helper.conf diff --git a/distbuild/usr/lib/distbuild-setup/ansible/distbuild-setup.yml b/distbuild/usr/lib/distbuild-setup/ansible/distbuild-setup.yml deleted file mode 100644 index c3074c63..00000000 --- a/distbuild/usr/lib/distbuild-setup/ansible/distbuild-setup.yml +++ /dev/null @@ -1,115 +0,0 @@ ---- -- hosts: localhost - vars_files: - - "/etc/distbuild/distbuild.conf" - tasks: - - - set_fact: ARTIFACT_CACHE_SERVER={{ TROVE_HOST }} - when: ARTIFACT_CACHE_SERVER is not defined - - - name: Create mountpoint for extra disk space /srv/distbuild/ - file: path=/srv/distbuild state=directory owner=root group=root mode=0755 - - - name: Create the morph and morph-cache-server configuration files - template: src=/usr/share/distbuild-setup/{{ item }} dest=/etc/{{ item }} - with_items: - - morph.conf - - morph-cache-server.conf - - - name: Link the morph log file - file: src=/srv/distbuild/morph.log dest=/var/log/morph.log state=link force=yes - - - name: Create the controller configuration files - template: src=/usr/share/distbuild-setup/{{ item }} dest=/etc/{{ item }} - with_items: - - morph-controller.conf - - morph-controller-helper.conf - when: DISTBUILD_CONTROLLER - - - name: Link the controller log files - file: src=/srv/distbuild/{{ item }} dest=/var/log/{{ item }} state=link force=yes - with_items: - - morph-controller.log - - morph-controller-helper.log - when: DISTBUILD_CONTROLLER - - - name: Create the worker configuration files - template: src=/usr/share/distbuild-setup/{{ item }} dest=/etc/{{ item }} - with_items: - - morph-worker.conf - - morph-worker-helper.conf - when: DISTBUILD_WORKER - - - name: Link the controller log files - file: src=/srv/distbuild/{{ item }} dest=/var/log/{{ item }} state=link force=yes - with_items: - - morph-worker.log - - morph-worker-helper.log - when: DISTBUILD_WORKER - - - name: Create /root/.ssh directory - file: path=/root/.ssh state=directory owner=root group=root mode=0700 - - - name: Copy the worker ssh key - copy: src={{ WORKER_SSH_KEY }} dest=/root/.ssh/id_rsa owner=root group=root mode=0600 - - - name: Create ssh public key - shell: ssh-keygen -y -f /root/.ssh/id_rsa > /root/.ssh/id_rsa.pub creates=/root/.ssh/id_rsa.pub - - - name: Add trove's host key - shell: | - trove_key="$(ssh-keyscan -t dsa,ecdsa,rsa {{ TROVE_HOST|quote }})" - if [ -n "$trove_key" ]; then - echo "$trove_key" > /etc/ssh/ssh_known_hosts - fi - creates=/etc/ssh/ssh_known_hosts - - # This is a kludge. We can add the host key for the TROVE_HOST that was - # specified, but users may access the Trove by other names, e.g. IP address - # or domain name. Distbuild is currently not safe to run except on a private - # network where host key checking is not important, so we disable it by - # default to avoid errors when users don't stick to using the exact same - # TROVE_HOST in repo URLs. - - name: Disable strict SSH host key checking - lineinfile: - dest: /etc/ssh/ssh_config - line: StrictHostKeyChecking no - - - name: Enable the morph-cache-server service - service: name=morph-cache-server.service enabled=yes - register: morph_cache_server_service - - name: Restart the morph-cache-server service - service: name=morph-cache-server state=restarted - when: morph_cache_server_service|changed - - - name: Enable the morph-worker service - service: name=morph-worker.service enabled=yes - register: morph_worker_service - when: DISTBUILD_WORKER - - name: Restart the morph-worker service - service: name=morph-worker state=restarted - when: morph_worker_service|changed - - - name: Enable the morph-worker-helper service - service: name=morph-worker-helper.service enabled=yes - register: morph_worker_helper_service - when: DISTBUILD_WORKER - - name: Restart the morph-worker-helper service - service: name=morph-worker-helper state=restarted - when: morph_worker_helper_service|changed - - - name: Enable the morph-controller service - service: name=morph-controller.service enabled=yes - register: morph_controller_service - when: DISTBUILD_CONTROLLER - - name: Restart the morph-controller service - service: name=morph-controller state=restarted - when: morph_controller_service|changed - - - name: Enable the morph-controller-helper service - service: name=morph-controller-helper.service enabled=yes - register: morph_controller_helper_service - when: DISTBUILD_CONTROLLER - - name: Restart the morph-controller-helper service - service: name=morph-controller-helper state=restarted - when: morph_controller_helper_service|changed diff --git a/distbuild/usr/lib/distbuild-setup/ansible/hosts b/distbuild/usr/lib/distbuild-setup/ansible/hosts deleted file mode 100644 index 5b97818d..00000000 --- a/distbuild/usr/lib/distbuild-setup/ansible/hosts +++ /dev/null @@ -1 +0,0 @@ -localhost ansible_connection=local diff --git a/distbuild/usr/lib/systemd/system/distbuild-setup.service b/distbuild/usr/lib/systemd/system/distbuild-setup.service deleted file mode 100644 index ec5f5a2d..00000000 --- a/distbuild/usr/lib/systemd/system/distbuild-setup.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Run distbuild-setup Ansible scripts -Requires=network.target -After=network.target -Requires=opensshd.service -After=opensshd.service - -# If there's a shared /var subvolume, it must be mounted before this -# unit runs. -Requires=local-fs.target -After=local-fs.target - -ConditionPathExists=/etc/distbuild/distbuild.conf - -[Service] -ExecStart=/usr/bin/ansible-playbook -v -i /usr/lib/distbuild-setup/ansible/hosts /usr/lib/distbuild-setup/ansible/distbuild-setup.yml diff --git a/distbuild/usr/lib/systemd/system/morph-cache-server.service b/distbuild/usr/lib/systemd/system/morph-cache-server.service deleted file mode 100644 index f55f3b6d..00000000 --- a/distbuild/usr/lib/systemd/system/morph-cache-server.service +++ /dev/null @@ -1,12 +0,0 @@ -[Install] -WantedBy=multi-user.target - -[Unit] -Description=Morph cache server -Requires=local-fs.target network.target -After=local-fs.target network.target -ConditionPathExists=/etc/morph-cache-server.conf - -[Service] -ExecStart=/usr/bin/morph-cache-server -Restart=always diff --git a/distbuild/usr/lib/systemd/system/morph-controller-helper.service b/distbuild/usr/lib/systemd/system/morph-controller-helper.service deleted file mode 100644 index 3f30cbcf..00000000 --- a/distbuild/usr/lib/systemd/system/morph-controller-helper.service +++ /dev/null @@ -1,13 +0,0 @@ -[Install] -WantedBy=multi-user.target - -[Unit] -Description=Morph distributed build controller helper -Requires=morph-controller.service -After=morph-controller.service -ConditionPathExists=/etc/morph-controller.conf -ConditionPathExists=/etc/morph-controller-helper.conf - -[Service] -ExecStart=/usr/bin/distbuild-helper --config /etc/morph-controller-helper.conf -Restart=always diff --git a/distbuild/usr/lib/systemd/system/morph-controller.service b/distbuild/usr/lib/systemd/system/morph-controller.service deleted file mode 100644 index 1556d232..00000000 --- a/distbuild/usr/lib/systemd/system/morph-controller.service +++ /dev/null @@ -1,12 +0,0 @@ -[Install] -WantedBy=multi-user.target - -[Unit] -Description=Morph distributed build controller -Requires=local-fs.target network.target -After=local-fs.target network.target -ConditionPathExists=/etc/morph-controller.conf - -[Service] -ExecStart=/usr/bin/morph controller-daemon --config /etc/morph-controller.conf -Restart=always diff --git a/distbuild/usr/lib/systemd/system/morph-worker-helper.service b/distbuild/usr/lib/systemd/system/morph-worker-helper.service deleted file mode 100644 index 28400701..00000000 --- a/distbuild/usr/lib/systemd/system/morph-worker-helper.service +++ /dev/null @@ -1,13 +0,0 @@ -[Install] -WantedBy=multi-user.target - -[Unit] -Description=Morph distributed build worker helper -Requires=morph-worker.service -After=morph-worker.service -ConditionPathExists=/etc/morph-worker.conf -ConditionPathExists=/etc/morph-worker-helper.conf - -[Service] -ExecStart=/usr/bin/distbuild-helper --config /etc/morph-worker-helper.conf -Restart=always diff --git a/distbuild/usr/lib/systemd/system/morph-worker.service b/distbuild/usr/lib/systemd/system/morph-worker.service deleted file mode 100644 index 90fea404..00000000 --- a/distbuild/usr/lib/systemd/system/morph-worker.service +++ /dev/null @@ -1,13 +0,0 @@ -[Install] -WantedBy=multi-user.target - -[Unit] -Description=Morph distributed build worker -Requires=local-fs.target network.target -Wants=srv-distbuild-ccache.mount -After=local-fs.target network.target srv-distbuild-ccache.mount -ConditionPathExists=/etc/morph-worker.conf - -[Service] -ExecStart=/usr/bin/morph worker-daemon --config /etc/morph-worker.conf -Restart=always diff --git a/distbuild/usr/lib/systemd/system/multi-user.target.wants/distbuild-setup.service b/distbuild/usr/lib/systemd/system/multi-user.target.wants/distbuild-setup.service deleted file mode 120000 index 8f06febd..00000000 --- a/distbuild/usr/lib/systemd/system/multi-user.target.wants/distbuild-setup.service +++ /dev/null @@ -1 +0,0 @@ -../distbuild-setup.service
\ No newline at end of file diff --git a/distbuild/usr/share/distbuild-setup/morph-cache-server.conf b/distbuild/usr/share/distbuild-setup/morph-cache-server.conf deleted file mode 100644 index b9020e7d..00000000 --- a/distbuild/usr/share/distbuild-setup/morph-cache-server.conf +++ /dev/null @@ -1,5 +0,0 @@ -[config] -port = 8080 -artifact-dir = /srv/distbuild/artifacts -direct-mode = True -fcgi-server = False diff --git a/distbuild/usr/share/distbuild-setup/morph-controller-helper.conf b/distbuild/usr/share/distbuild-setup/morph-controller-helper.conf deleted file mode 100644 index 99d38739..00000000 --- a/distbuild/usr/share/distbuild-setup/morph-controller-helper.conf +++ /dev/null @@ -1,5 +0,0 @@ -[config] -log = /srv/distbuild/morph-controller-helper.log -log-max = 100M -parent-port = 5656 -parent-address = 127.0.0.1 diff --git a/distbuild/usr/share/distbuild-setup/morph-controller.conf b/distbuild/usr/share/distbuild-setup/morph-controller.conf deleted file mode 100644 index c16c0343..00000000 --- a/distbuild/usr/share/distbuild-setup/morph-controller.conf +++ /dev/null @@ -1,6 +0,0 @@ -[config] -log = /srv/distbuild/morph-controller.log -log-max = 100M -writeable-cache-server = http://{{ ARTIFACT_CACHE_SERVER }}:8081/ -worker = {{ WORKERS }} -controller-helper-address = 127.0.0.1 diff --git a/distbuild/usr/share/distbuild-setup/morph-worker-helper.conf b/distbuild/usr/share/distbuild-setup/morph-worker-helper.conf deleted file mode 100644 index 29d4ef3f..00000000 --- a/distbuild/usr/share/distbuild-setup/morph-worker-helper.conf +++ /dev/null @@ -1,4 +0,0 @@ -[config] -log = /srv/distbuild/morph-worker-helper.log -log-max = 100M -parent-address = 127.0.0.1 diff --git a/distbuild/usr/share/distbuild-setup/morph-worker.conf b/distbuild/usr/share/distbuild-setup/morph-worker.conf deleted file mode 100644 index fb382bad..00000000 --- a/distbuild/usr/share/distbuild-setup/morph-worker.conf +++ /dev/null @@ -1,4 +0,0 @@ -[config] -log = /srv/distbuild/morph-worker.log -log-max = 100M -controller-initiator-address = diff --git a/distbuild/usr/share/distbuild-setup/morph.conf b/distbuild/usr/share/distbuild-setup/morph.conf deleted file mode 100644 index 29de684c..00000000 --- a/distbuild/usr/share/distbuild-setup/morph.conf +++ /dev/null @@ -1,13 +0,0 @@ -[config] -log = /srv/distbuild/morph.log -log-max = 100M -cachedir = /srv/distbuild -tempdir = /srv/distbuild/tmp -trove-host = {{ TROVE_HOST }} -trove-id = {{ TROVE_ID }} -controller-initiator-address = {{ CONTROLLERHOST }} -tempdir-min-space = 4G -cachedir-min-space = 4G -build-ref-prefix = {{ TROVE_ID }} -artifact-cache-server = http://{{ ARTIFACT_CACHE_SERVER }}:8080/ -git-resolve-cache-server = http://{{ TROVE_HOST }}:8080/ |