infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

bump osbs in prod to f26

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2017-10-04 18:33:35 +00:00
parent ca65bb4ecb
commit 7f1a93b7ea
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
files/osbs/buildroot-Dockerfile-production.j2
View file

@ -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

4
inventory/host_vars/osbs-master01.phx2.fedoraproject.org
View file

@ -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

4
inventory/host_vars/osbs-node01.phx2.fedoraproject.org
View file

@ -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

4
inventory/host_vars/osbs-node02.phx2.fedoraproject.org
View file

@ -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

8
playbooks/groups/osbs-cluster.yml
View file

@ -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,