From acd9ef280fc4afdf98ec78e70d5fff6aeb08a1ce Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 16 Feb 2016 17:00:40 +0000 Subject: [PATCH] osbs-dev: change cert name for docker, add fedora image import/update task for builder --- playbooks/hosts/osbs-dev.fedorainfracloud.org.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml index f3fe69f6bb..a057d04d82 100644 --- a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml @@ -72,12 +72,12 @@ dir: "/etc/pki/docker/osbs-dev.fedorainfracloud.org:5000/", src_name: "osbs-dev.fedorainfracloud.org.crt", src_key_name: "osbs-dev.fedorainfracloud.org.key", - dest_name: "ca.crt", + dest_name: "ca.cert", dest_key_name: "ca.key" }, tls: { enabled: True, - certificate: "/etc/pki/docker/osbs-dev.fedorainfracloud.org:5000/ca.crt", + certificate: "/etc/pki/docker/osbs-dev.fedorainfracloud.org:5000/ca.cert", key: "/etc/pki/docker/osbs-dev.fedorainfracloud.org:5000/ca.key", } } @@ -119,6 +119,9 @@ args: creates: /etc/osbs_fedora_imagestream_created + - name: make sure latest fedora image is pulled and pushed to osbs registry + shell: docker pull fedora && docker tag -f fedora:latest osbs-dev.fedorainfracloud.org:5000/fedora:latest && docker push osbs-dev.fedorainfracloud.org:5000/fedora:latest + - name: create buildroot container shell: atomic-reactor create-build-image --reactor-tarball-path /usr/share/atomic-reactor/atomic-reactor.tar.gz /usr/share/atomic-reactor/images/dockerhost-builder buildroot