Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

enable candidate-registry for osbs in prod

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-09-02 14:24:33 +00:00
parent c410ab9b8c
commit 794ab5d43f
9 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/buildarm
View file

@ -21,7 +21,7 @@ csi_relationship: |
# These variables are for koji-containerbuild/osbs # These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.fedoraproject.org" osbs_fqdn: "osbs.fedoraproject.org"
docker_registry: "registry.fedoraproject.org" docker_registry: "candidate-registry.fedoraproject.org"
source_registry: "registry.fedoraproject.org" source_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji" koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub" koji_hub: "koji.fedoraproject.org/kojihub"

2
inventory/group_vars/buildhw
View file

@ -23,7 +23,7 @@ csi_relationship: |
# These variables are for koji-containerbuild/osbs # These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.fedoraproject.org" osbs_fqdn: "osbs.fedoraproject.org"
docker_registry: "registry.fedoraproject.org" docker_registry: "candidate-registry.fedoraproject.org"
source_registry: "registry.fedoraproject.org" source_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji" koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub" koji_hub: "koji.fedoraproject.org/kojihub"

2
inventory/group_vars/buildvm
View file

@ -35,7 +35,7 @@ csi_relationship: |
# These variables are for koji-containerbuild/osbs # These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.fedoraproject.org" osbs_fqdn: "osbs.fedoraproject.org"
docker_registry: "registry.fedoraproject.org" docker_registry: "candidate-registry.fedoraproject.org"
source_registry: "registry.fedoraproject.org" source_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji" koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub" koji_hub: "koji.fedoraproject.org/kojihub"

2
inventory/group_vars/buildvm-aarch64
View file

@ -34,7 +34,7 @@ csi_relationship: |
# These variables are for koji-containerbuild/osbs # These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.fedoraproject.org" osbs_fqdn: "osbs.fedoraproject.org"
docker_registry: "registry.fedoraproject.org" docker_registry: "candidate-registry.fedoraproject.org"
source_registry: "registry.fedoraproject.org" source_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji" koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub" koji_hub: "koji.fedoraproject.org/kojihub"

2
inventory/group_vars/buildvm-s390
View file

@ -11,7 +11,7 @@ koji_topurl: "http://s390pkgs.fedoraproject.org/"
# These variables are for koji-containerbuild/osbs # These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.fedoraproject.org" osbs_fqdn: "osbs.fedoraproject.org"
docker_registry: "registry.fedoraproject.org" docker_registry: "candidate-registry.fedoraproject.org"
source_registry: "registry.fedoraproject.org" source_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji" koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub" koji_hub: "koji.fedoraproject.org/kojihub"

2
inventory/group_vars/koji
View file

@ -45,7 +45,7 @@ nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
virt_install_command: "{{ virt_install_command_two_nic }}" virt_install_command: "{{ virt_install_command_two_nic }}"
osbs_fqdn: "osbs.fedoraproject.org" osbs_fqdn: "osbs.fedoraproject.org"
docker_registry: "registry.fedoraproject.org" docker_registry: "candidate-registry.fedoraproject.org"
source_registry: "registry.fedoraproject.org" source_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji" koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub" koji_hub: "koji.fedoraproject.org/kojihub"

4
inventory/group_vars/osbs
View file

@ -9,8 +9,8 @@ tcp_ports: [ 80, 443, 8443]
fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran
sudoers: "{{ private }}/files/sudo/00releng-sudoers" sudoers: "{{ private }}/files/sudo/00releng-sudoers"
docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org" docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org"
docker_registry: "registry.fedoraproject.org" docker_registry: "candidate-registry.fedoraproject.org"
source_registry: "registry.fedoraproject.org" source_registry: "registry.fedoraproject.org"
osbs_url: "osbs.fedoraproject.org" osbs_url: "osbs.fedoraproject.org"

7
playbooks/groups/docker-registry.yml
View file

@ -89,3 +89,10 @@
when: env == "production", when: env == "production",
delegate_to: compose-x86-01.phx2.fedoraproject.org delegate_to: compose-x86-01.phx2.fedoraproject.org
} }
- {
role: push-docker,
docker_cert_name: "containerbuild",
docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org",
when: env == "production",
delegate_to: compose-x86-01.phx2.fedoraproject.org
}

2
playbooks/groups/osbs-master.yml
View file

@ -80,7 +80,7 @@
- { - {
role: push-docker, role: push-docker,
docker_cert_name: "containerbuild", docker_cert_name: "containerbuild",
docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org", docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org",
when: env == "production" when: env == "production"
} }