add osbs-cluster including external openshift-ansible repo's cluster

playbook and inventory entries

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller
2016-10-18 20:26:46 +00:00
parent 806d7651eb
commit 5a316c72d4
5 changed files with 91 additions and 2 deletions

View File

@@ -1,4 +1,20 @@
---
#######
# BEGIN: Ansible roles_path variables
#
# Background/reference about external repos pulled in:
# https://pagure.io/fedora-infrastructure/issue/5476
#
ansible_base: /srv/web/infra
# Path to the openshift-ansible checkout as external git repo brought into
# Fedora Infra
openshift_ansible: /srv/web/infra/openshift-ansible/
#
# END: Ansible roles_path variables
#######
freezes: true
# most of our systems are in phx2
datacenter: phx2

View File

@@ -19,3 +19,6 @@ osbs_koji_username: "kojibuilder_stg"
koji_url: "koji.stg.fedoraproject.org"
osbs_client_conf_path: /etc/osbs.conf
openshift_node_labels="{'region':'infra'}"
openshift_schedulable=False

View File

@@ -19,3 +19,5 @@ osbs_koji_username: "kojibuilder_stg"
koji_url: "koji.stg.fedoraproject.org"
osbs_client_conf_path: /etc/osbs.conf
openshift_node_labels="{'region': 'primary', 'zone': 'default'}

View File

@@ -1195,6 +1195,7 @@ qa14.qa.fedoraproject.org
taskotron-stg01.qa.fedoraproject.org
taskotron01.qa.fedoraproject.org
[osbs]
osbs-master01.phx2.fedoraproject.org
@@ -1202,14 +1203,47 @@ osbs-master01.phx2.fedoraproject.org
osbs-node01.phx2.fedoraproject.org
osbs-node02.phx2.fedoraproject.org
[osbs-stg]
osbs-master01.stg.phx2.fedoraproject.org
#####
# This is for the OSBS scale-out deployment work, the following group names are
# unfortunately hard-coded into the openshift-ansible playbooks and roles and
# must be used:
# OSEv3
# masters
# nodes
# etcd
# lb
#
# In an attempt to separate this out the best as we can, the descriptive group
# names are used below and we then set those groups as children as necessary
[OSEv3:children]
masters
nodes
etcd
lb
[nodes:children]
osbs-masters-stg
osbs-nodes-stg
[masters:children]
osbs-masters-stg
[etcd:children]
osbs-masters-stg
[lb:children]
osbs-masters-stg
[osbs-masters-stg]
osbs-master01.stg.phx2.fedoraproject.org
[osbs-nodes-stg]
osbs-node01.stg.phx2.fedoraproject.org
osbs-node02.stg.phx2.fedoraproject.org
# Docker (docker-distribution) registries
[docker-registry]
docker-registry01.phx2.fedoraproject.org
docker-candidate-registry01.phx2.fedoraproject.org