From 7f1a93b7ea6d370d0975c2fdc5cdca2ad0dbdb75 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 4 Oct 2017 18:33:35 +0000 Subject: [PATCH] bump osbs in prod to f26 Signed-off-by: Adam Miller --- files/osbs/buildroot-Dockerfile-production.j2 | 2 +- inventory/host_vars/osbs-master01.phx2.fedoraproject.org | 4 ++-- inventory/host_vars/osbs-node01.phx2.fedoraproject.org | 4 ++-- inventory/host_vars/osbs-node02.phx2.fedoraproject.org | 4 ++-- playbooks/groups/osbs-cluster.yml | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/files/osbs/buildroot-Dockerfile-production.j2 b/files/osbs/buildroot-Dockerfile-production.j2 index fa7c80bb87..8f9ef88c18 100644 --- a/files/osbs/buildroot-Dockerfile-production.j2 +++ b/files/osbs/buildroot-Dockerfile-production.j2 @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora ADD ./infra-tags.repo /etc/yum.repos.d/infra-tags.repo -RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python-docker-py python-setuptools e2fsprogs koji python-backports-lzma osbs-client gssproxy fedpkg python-docker-squash atomic-reactor python-atomic-reactor* go-md2man +RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python-setuptools e2fsprogs koji python-backports-lzma osbs-client python-osbs-client gssproxy fedpkg python-docker-squash atomic-reactor python-atomic-reactor* go-md2man RUN sed -i 's|.*default_ccache_name.*| default_ccache_name = DIR:/tmp/ccache_%{uid}|g' /etc/krb5.conf ADD ./krb5.osbs_{{osbs_url}}.keytab /etc/ ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs.ca.crt diff --git a/inventory/host_vars/osbs-master01.phx2.fedoraproject.org b/inventory/host_vars/osbs-master01.phx2.fedoraproject.org index 16287e71ae..47d90cae97 100644 --- a/inventory/host_vars/osbs-master01.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-master01.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24-osbs -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.125.55 vmhost: bvirthost01.phx2.fedoraproject.org diff --git a/inventory/host_vars/osbs-node01.phx2.fedoraproject.org b/inventory/host_vars/osbs-node01.phx2.fedoraproject.org index ee1fb0c6c3..894d2e90a0 100644 --- a/inventory/host_vars/osbs-node01.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-node01.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24-osbs -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.125.53 vmhost: bvirthost01.phx2.fedoraproject.org diff --git a/inventory/host_vars/osbs-node02.phx2.fedoraproject.org b/inventory/host_vars/osbs-node02.phx2.fedoraproject.org index 5487458bf8..88c8936c5f 100644 --- a/inventory/host_vars/osbs-node02.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-node02.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24-osbs -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.125.54 vmhost: bvirthost01.phx2.fedoraproject.org diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 63bac6d496..77b0def02a 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -201,10 +201,10 @@ cluster_inventory_filename: "cluster-inventory-stg", openshift_htpasswd_file: "/etc/origin/htpasswd", openshift_master_public_api_url: "https://{{ osbs_url }}:8443", - openshift_release: "v1.3.1", + openshift_release: "v3.6.0", openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_playbook: "playbooks/byo/config.yml", - openshift_ansible_version: "openshift-ansible-3.3.57-1", + openshift_ansible_version: "release-3.6", openshift_ansible_ssh_user: root, openshift_ansible_install_examples: false, openshift_ansible_containerized_deploy: false, @@ -225,10 +225,10 @@ cluster_inventory_filename: "cluster-inventory", openshift_htpasswd_file: "/etc/origin/htpasswd", openshift_master_public_api_url: "https://{{ osbs_url }}:8443", - openshift_release: "v1.3.1", + openshift_release: "v3.6.0", openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_playbook: "playbooks/byo/config.yml", - openshift_ansible_version: "openshift-ansible-3.3.57-1", + openshift_ansible_version: "release-3.6", openshift_ansible_ssh_user: root, openshift_ansible_install_examples: false, openshift_ansible_containerized_deploy: false,