diff options
| author | Adam Miller <admiller@redhat.com> | 2017-08-07 18:57:49 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2017-08-07 18:57:51 +0000 |
| commit | e0121791ae51406530be2fa5e4e538b36b56d134 (patch) | |
| tree | ead90607e58f22b368d5ec4dbfa11f198ad83333 /playbooks/groups | |
| parent | 7d9b83f894ec048b148029e345bd21c2528ccc9b (diff) | |
| download | ansible-e0121791ae51406530be2fa5e4e538b36b56d134.tar.gz ansible-e0121791ae51406530be2fa5e4e538b36b56d134.tar.xz ansible-e0121791ae51406530be2fa5e4e538b36b56d134.zip | |
run osbs image sync from a system that can actually delegate to composer
Signed-off-by: Adam Miller <admiller@redhat.com>
Diffstat (limited to 'playbooks/groups')
| -rw-r--r-- | playbooks/groups/osbs-orchestrator-cluster.yml | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml index f179c83fc..57e47129c 100644 --- a/playbooks/groups/osbs-orchestrator-cluster.yml +++ b/playbooks/groups/osbs-orchestrator-cluster.yml @@ -584,8 +584,8 @@ src: "{{files}}/osbs/cleanup-old-osbs-builds" dest: "/etc/cron.d/cleanup-old-osbs-builds" -- name: Manage docker images and image stream - hosts: osbs-masters-stg[0]:osbsworker-x86-64-masters-stg[0] +- name: Manage docker images + hosts: batcave01.phx2.fedoraproject.org tags: - osbs-post-install - manage-docker-images @@ -594,14 +594,6 @@ - /srv/private/ansible/vars.yml - /srv/private/ansible/files/openstack/passwords.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - vars: - osbs_kubeconfig_path: /etc/origin/master/admin.kubeconfig - osbs_environment: - KUBECONFIG: "{{ osbs_kubeconfig_path }}" - koji_pki_dir: /etc/pki/koji - koji_ca_cert_path: "{{koji_pki_dir}}/fedora-server-ca.cert" - koji_cert_path: "{{koji_pki_dir}}/fedora-builder.pem" - koji_builder_user: dockerbuilder tasks: # NOTE: Need to delegate to compose-x86-01.phx2.fedoraproject.org for prod @@ -614,6 +606,18 @@ changed_when: "'Skipping fetch of repeat blob' not in docker_pull_openshift_delegated.stdout" when: env == "staging" +- name: Manage docker images + hosts: osbs-masters-stg[0]:osbsworker-x86-64-masters-stg[0] + tags: + - osbs-post-install + - manage-docker-images + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - /srv/private/ansible/vars.yml + - /srv/private/ansible/files/openstack/passwords.yml + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + tasks: - name: create fedora image stream for OpenShift shell: "echo '{ \"apiVersion\": \"v1\", \"kind\": \"ImageStream\", \"metadata\": { \"name\": \"fedora\" }, \"spec\": { \"dockerImageRepository\": \"{{candidate_registry}}/fedora\" } }' | oc create -f - && touch /etc/origin/fedoraimagestreamcreated" environment: "{{ osbs_environment }}" |