add new openshift site
This commit is contained in:
parent
259b31fc84
commit
23a7abea18
9 changed files with 179 additions and 0 deletions
|
@ -120,6 +120,7 @@
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/greenwave.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/greenwave.yml
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/librariesio2fedmsg.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/librariesio2fedmsg.yml
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/waiverdb.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/waiverdb.yml
|
||||||
|
- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/coreos.yml
|
||||||
# These need work to finish and complete and are all stg currently.
|
# These need work to finish and complete and are all stg currently.
|
||||||
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/modernpaste.yml
|
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/modernpaste.yml
|
||||||
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/rats.yml
|
#- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/rats.yml
|
||||||
|
|
|
@ -710,6 +710,15 @@
|
||||||
keephost: true
|
keephost: true
|
||||||
tags: waiverdb
|
tags: waiverdb
|
||||||
|
|
||||||
|
- role: httpd/reverseproxy
|
||||||
|
website: coreos.fedoraproject.org
|
||||||
|
destname: coreos
|
||||||
|
# haproxy entry for os-nodes-frontend
|
||||||
|
proxyurl: http://localhost:10065
|
||||||
|
keephost: true
|
||||||
|
tags: coreos
|
||||||
|
|
||||||
|
|
||||||
- role: httpd/reverseproxy
|
- role: httpd/reverseproxy
|
||||||
website: data-analysis.fedoraproject.org
|
website: data-analysis.fedoraproject.org
|
||||||
destname: awstats
|
destname: awstats
|
||||||
|
|
|
@ -847,6 +847,12 @@
|
||||||
server_aliases: [waiverdb.stg.fedoraproject.org]
|
server_aliases: [waiverdb.stg.fedoraproject.org]
|
||||||
cert_name: "{{wildcard_cert_name}}"
|
cert_name: "{{wildcard_cert_name}}"
|
||||||
|
|
||||||
|
- role: httpd/website
|
||||||
|
site_name: coreos.fedoraproject.org
|
||||||
|
sslonly: true
|
||||||
|
server_aliases: [coreos.stg.fedoraproject.org]
|
||||||
|
cert_name: "{{wildcard_cert_name}}"
|
||||||
|
|
||||||
# fedorahosted is retired. We have the site here so we can redirect it.
|
# fedorahosted is retired. We have the site here so we can redirect it.
|
||||||
|
|
||||||
- role: httpd/website
|
- role: httpd/website
|
||||||
|
|
51
playbooks/openshift-apps/coreos.yml
Normal file
51
playbooks/openshift-apps/coreos.yml
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
- name: make the app be real
|
||||||
|
hosts: os-masters[0]:os-masters-stg[0]
|
||||||
|
user: root
|
||||||
|
gather_facts: False
|
||||||
|
|
||||||
|
vars_files:
|
||||||
|
- /srv/web/infra/ansible/vars/global.yml
|
||||||
|
- "/srv/private/ansible/vars.yml"
|
||||||
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
|
roles:
|
||||||
|
- role: openshift/project
|
||||||
|
app: coreos
|
||||||
|
description: coreos.fedoraproject.org static website
|
||||||
|
appowners:
|
||||||
|
- misc
|
||||||
|
- sanja
|
||||||
|
- role: openshift/object
|
||||||
|
app: coreos
|
||||||
|
template: imagestream.yml
|
||||||
|
objectname: imagestream.yml
|
||||||
|
- role: openshift/object
|
||||||
|
app: coreos
|
||||||
|
template: buildconfig.yml
|
||||||
|
objectname: buildconfig.yml
|
||||||
|
|
||||||
|
- role: openshift/start-build
|
||||||
|
app: coreos
|
||||||
|
buildname: coreos-build
|
||||||
|
objectname: coreos-build
|
||||||
|
|
||||||
|
- role: openshift/object
|
||||||
|
app: coreos
|
||||||
|
file: service.yml
|
||||||
|
objectname: service.yml
|
||||||
|
|
||||||
|
- role: openshift/route
|
||||||
|
app: coreos
|
||||||
|
routename: coreos
|
||||||
|
host: "coreos.fedoraproject.org"
|
||||||
|
serviceport: web
|
||||||
|
servicename: coreos
|
||||||
|
|
||||||
|
- role: openshift/object
|
||||||
|
app: coreos
|
||||||
|
file: deploymentconfig.yml
|
||||||
|
objectname: deploymentconfig.yml
|
||||||
|
|
||||||
|
- role: openshift/rollout
|
||||||
|
app: coreos
|
||||||
|
dcname: coreos
|
|
@ -114,6 +114,15 @@ define service {
|
||||||
use websitetemplate
|
use websitetemplate
|
||||||
}
|
}
|
||||||
|
|
||||||
|
define service {
|
||||||
|
hostgroup_name proxies
|
||||||
|
service_description http-coreos
|
||||||
|
check_command check_website_ssl!coreos-coreos-coreos.app.os.fedoraproject.org!/!Fedora
|
||||||
|
max_check_attempts 8
|
||||||
|
use websitetemplate
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
define service {
|
define service {
|
||||||
hostgroup_name proxies
|
hostgroup_name proxies
|
||||||
service_description http-modernpaste
|
service_description http-modernpaste
|
||||||
|
|
50
roles/openshift-apps/coreos/files/deploymentconfig.yml
Normal file
50
roles/openshift-apps/coreos/files/deploymentconfig.yml
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: DeploymentConfig
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: coreos
|
||||||
|
service: coreos
|
||||||
|
name: coreos
|
||||||
|
spec:
|
||||||
|
replicas: 2
|
||||||
|
selector:
|
||||||
|
app: coreos
|
||||||
|
deploymentconfig: coreos
|
||||||
|
strategy:
|
||||||
|
resources: {}
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: coreos
|
||||||
|
deploymentconfig: coreos
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- image: coreos:latest
|
||||||
|
name: coreos
|
||||||
|
ports:
|
||||||
|
- containerPort: 8080
|
||||||
|
protocol: TCP
|
||||||
|
readinessProbe:
|
||||||
|
timeoutSeconds: 1
|
||||||
|
initialDelaySeconds: 5
|
||||||
|
httpGet:
|
||||||
|
path: /
|
||||||
|
port: 8080
|
||||||
|
livenessProbe:
|
||||||
|
timeoutSeconds: 1
|
||||||
|
initialDelaySeconds: 30
|
||||||
|
httpGet:
|
||||||
|
path: /
|
||||||
|
port: 8080
|
||||||
|
|
||||||
|
triggers:
|
||||||
|
- type: ConfigChange
|
||||||
|
- type: ImageChange
|
||||||
|
imageChangeParams:
|
||||||
|
automatic: true
|
||||||
|
containerNames:
|
||||||
|
- coreos
|
||||||
|
from:
|
||||||
|
kind: ImageStreamTag
|
||||||
|
name: coreos:latest
|
16
roles/openshift-apps/coreos/files/service.yml
Normal file
16
roles/openshift-apps/coreos/files/service.yml
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: coreos
|
||||||
|
name: coreos
|
||||||
|
spec:
|
||||||
|
ports:
|
||||||
|
- name: 8080-tcp
|
||||||
|
port: 8080
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: 8080
|
||||||
|
selector:
|
||||||
|
app: coreos
|
||||||
|
deploymentconfig: coreos
|
||||||
|
|
28
roles/openshift-apps/coreos/templates/buildconfig.yml
Normal file
28
roles/openshift-apps/coreos/templates/buildconfig.yml
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
apiVersion: v1
|
||||||
|
kind: BuildConfig
|
||||||
|
metadata:
|
||||||
|
name: coreos
|
||||||
|
label:
|
||||||
|
environment: "coreos"
|
||||||
|
spec:
|
||||||
|
output:
|
||||||
|
to:
|
||||||
|
kind: ImageStreamTag
|
||||||
|
name: coreos:latest
|
||||||
|
source:
|
||||||
|
type: Git
|
||||||
|
git:
|
||||||
|
uri: https://github.com/coreos/coreos.fedoraproject.org.git
|
||||||
|
strategy:
|
||||||
|
type: Source
|
||||||
|
sourceStrategy:
|
||||||
|
from:
|
||||||
|
kind: ImageStreamTag
|
||||||
|
name: s2i-golang:latest
|
||||||
|
triggers:
|
||||||
|
# TODO add that once it is clear on how to store the secret
|
||||||
|
# - type: GitHub
|
||||||
|
# github:
|
||||||
|
# secret: "some_coreos_github_secret"
|
||||||
|
- type: ConfigChange
|
||||||
|
- type: ImageChange
|
9
roles/openshift-apps/coreos/templates/imagestream.yml
Normal file
9
roles/openshift-apps/coreos/templates/imagestream.yml
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ImageStream
|
||||||
|
metadata:
|
||||||
|
name: coreos
|
||||||
|
spec:
|
||||||
|
lookupPolicy:
|
||||||
|
local: false
|
||||||
|
status:
|
||||||
|
dockerImageRepository: ""
|
Loading…
Add table
Add a link
Reference in a new issue