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

move stage osbs to candidate-registry.stg

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-08-29 21:14:43 +00:00
parent 4e9011a822
commit 4c363581f1
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/buildvm-stg
View file

@ -41,6 +41,6 @@ virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough
# These variables are for koji-containerbuild/osbs # These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.stg.fedoraproject.org" osbs_fqdn: "osbs.stg.fedoraproject.org"
docker_registry: "registry.stg.fedoraproject.org" docker_registry: "candidate-registry.stg.fedoraproject.org"
koji_root: "koji.stg.fedoraproject.org/koji" koji_root: "koji.stg.fedoraproject.org/koji"
koji_hub: "koji.stg.fedoraproject.org/kojihub" koji_hub: "koji.stg.fedoraproject.org/kojihub"

2
inventory/group_vars/koji-stg
View file

@ -43,7 +43,7 @@ koji_weburl: "http://koji.stg.fedoraproject.org/koji"
koji_topurl: "http://kojipkgs.fedoraproject.org/" koji_topurl: "http://kojipkgs.fedoraproject.org/"
osbs_fqdn: "osbs.stg.fedoraproject.org" osbs_fqdn: "osbs.stg.fedoraproject.org"
docker_registry: "registry.stg.fedoraproject.org" docker_registry: "candidate-registry.stg.fedoraproject.org"
koji_root: "koji.stg.fedoraproject.org/koji" koji_root: "koji.stg.fedoraproject.org/koji"
koji_hub: "koji.stg.fedoraproject.org/kojihub" koji_hub: "koji.stg.fedoraproject.org/kojihub"

4
inventory/group_vars/osbs-stg
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.stg.fedoraproject.org" docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org"
docker_registry: "registry.stg.fedoraproject.org" docker_registry: "candidate-registry.stg.fedoraproject.org"
osbs_url: "osbs.stg.fedoraproject.org" osbs_url: "osbs.stg.fedoraproject.org"
osbs_koji_username: "kojibuilder_stg" osbs_koji_username: "kojibuilder_stg"

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

@ -73,7 +73,7 @@
roles: roles:
- { - {
role: push-docker, role: push-docker,
docker_cert_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org", docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
when: env == "staging" when: env == "staging"
} }
- { - {