summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Miller <admiller@redhat.com>2016-04-14 15:13:33 +0000
committerAdam Miller <admiller@redhat.com>2016-04-14 15:13:33 +0000
commitb540680d27f81fc0495ceb9425a2e8b5cfd9bb77 (patch)
tree32415fab557f718ffc230df8846a2d483c50a5a5
parent0c9c36ff86acaca50cb2c5dbc9126c78f65a0865 (diff)
downloadansible-b540680d27f81fc0495ceb9425a2e8b5cfd9bb77.tar.gz
ansible-b540680d27f81fc0495ceb9425a2e8b5cfd9bb77.tar.xz
ansible-b540680d27f81fc0495ceb9425a2e8b5cfd9bb77.zip
configure stage koji to point to osbs.stg instead of osbs-dev
Signed-off-by: Adam Miller <admiller@redhat.com>
-rw-r--r--inventory/group_vars/buildvm-stg4
-rw-r--r--inventory/group_vars/koji-stg4
-rw-r--r--tasks/osbs_certs.yml4
3 files changed, 6 insertions, 6 deletions
diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg
index 3decf36e6..ec1882f22 100644
--- a/inventory/group_vars/buildvm-stg
+++ b/inventory/group_vars/buildvm-stg
@@ -39,7 +39,7 @@ csi_relationship: |
virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough,+vmx"
# These variables are for koji-containerbuild/osbs
-osbs_fqdn: "osbs-dev.fedorainfracloud.org"
-docker_registry: "osbs-dev.fedorainfracloud.org"
+osbs_fqdn: "osbs.stg.fedoraproject.org"
+docker_registry: "registry.stg.fedoraproject.org"
koji_root: "koji.stg.fedoraproject.org/koji"
koji_hub: "koji.stg.fedoraproject.org/kojihub"
diff --git a/inventory/group_vars/koji-stg b/inventory/group_vars/koji-stg
index 487682992..515e97403 100644
--- a/inventory/group_vars/koji-stg
+++ b/inventory/group_vars/koji-stg
@@ -42,8 +42,8 @@ koji_server_url: "http://koji.stg.fedoraproject.org/kojihub"
koji_weburl: "http://koji.stg.fedoraproject.org/koji"
koji_topurl: "http://kojipkgs.fedoraproject.org/"
-osbs_fqdn: "osbs-dev.fedorainfracloud.org"
-docker_registry: "osbs-dev.fedorainfracloud.org"
+osbs_fqdn: "osbs.stg.fedoraproject.org"
+docker_registry: "osbs.stg.fedoraproject.org"
koji_root: "koji.stg.fedoraproject.org/koji"
koji_hub: "koji.stg.fedoraproject.org/kojihub"
diff --git a/tasks/osbs_certs.yml b/tasks/osbs_certs.yml
index 74005ee0f..c48b40570 100644
--- a/tasks/osbs_certs.yml
+++ b/tasks/osbs_certs.yml
@@ -2,8 +2,8 @@
- name: put the osbs certs in place
copy:
- src: "{{private}}/files/osbs/osbs-dev.certs/osbs-dev.fedorainfracloud.org.crt"
- dest: "/etc/pki/ca-trust/source/anchors/osbs-dev.fedorainfracloud.org.crt"
+ src: "{{private}}/files/osbs/{{env}}/osbs-internal.pem"
+ dest: "/etc/pki/ca-trust/source/anchors/osbs-internal.pem"
owner: root
mode: 0400
when: env == "staging"