diff --git a/master.yml b/master.yml index 27196593b5..f9e0e5fc5e 100644 --- a/master.yml +++ b/master.yml @@ -117,12 +117,11 @@ - 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/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. #- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/koschei.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/release-monitoring.yml +- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/release-monitoring.yml #- import_playbook: /srv/web/infra/ansible/playbooks/openshift-apps/transtats.yml # diff --git a/playbooks/openshift-apps/containers.yml b/playbooks/openshift-apps/containers.yml deleted file mode 100644 index 3a8dac46ea..0000000000 --- a/playbooks/openshift-apps/containers.yml +++ /dev/null @@ -1,59 +0,0 @@ -- 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: containers - description: containers.fedoraproject.org static website - appowners: - - misc - - sanja - - role: openshift/object - app: containers - template: imagestream.yml - objectname: imagestream.yml - - role: openshift/object - app: containers - template: buildconfig.yml - objectname: buildconfig.yml - - - role: openshift/start-build - app: containers - buildname: containers-build - objectname: containers-build - - - role: openshift/object - app: containers - file: service.yml - objectname: service.yml - - - role: openshift/route - app: containers - routename: containers - host: "containers.fedoraproject.org" - serviceport: 8080-tcp - servicename: containers - when: env == "production" - - - role: openshift/route - app: containers - routename: containers - host: "containers{{ env_suffix }}.fedoraproject.org" - serviceport: 8080-tcp - servicename: containers - - - role: openshift/object - app: containers - file: deploymentconfig.yml - objectname: deploymentconfig.yml - - - role: openshift/rollout - app: containers - dcname: containers diff --git a/playbooks/openshift-apps/coreos.yml b/playbooks/openshift-apps/coreos.yml deleted file mode 100644 index 5d744644ee..0000000000 --- a/playbooks/openshift-apps/coreos.yml +++ /dev/null @@ -1,51 +0,0 @@ -- 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{{ env_suffix }}.fedoraproject.org" - serviceport: 8080-tcp - servicename: coreos - - - role: openshift/object - app: coreos - file: deploymentconfig.yml - objectname: deploymentconfig.yml - - - role: openshift/rollout - app: coreos - dcname: coreos diff --git a/roles/openshift-apps/containers/files/deploymentconfig.yml b/roles/openshift-apps/containers/files/deploymentconfig.yml deleted file mode 100644 index df2ff221ed..0000000000 --- a/roles/openshift-apps/containers/files/deploymentconfig.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -apiVersion: v1 -kind: DeploymentConfig -metadata: - labels: - app: containers - service: containers - name: containers -spec: - replicas: 2 - selector: - app: containers - deploymentconfig: containers - strategy: - resources: {} - template: - metadata: - labels: - app: containers - deploymentconfig: containers - spec: - containers: - - image: containers:latest - name: containers - 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: - - containers - from: - kind: ImageStreamTag - name: containers:latest diff --git a/roles/openshift-apps/containers/files/service.yml b/roles/openshift-apps/containers/files/service.yml deleted file mode 100644 index 00269c90d1..0000000000 --- a/roles/openshift-apps/containers/files/service.yml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: containers - name: containers -spec: - ports: - - name: 8080-tcp - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: containers - deploymentconfig: containers diff --git a/roles/openshift-apps/containers/templates/buildconfig.yml b/roles/openshift-apps/containers/templates/buildconfig.yml deleted file mode 100644 index 7579587527..0000000000 --- a/roles/openshift-apps/containers/templates/buildconfig.yml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: v1 -kind: BuildConfig -metadata: - name: containers-build - labels: - environment: "containers" -spec: - output: - to: - kind: ImageStreamTag - name: containers:latest - source: - type: Git - git: - uri: https://github.com/containers/containers.fedoraproject.org.git - strategy: - type: Source - sourceStrategy: - from: - kind: ImageStreamTag - name: s2i-golang:latest - triggers: -{% if containers_github_secret is defined %} - - type: GitHub - github: - secret: "{{ containers_github_secret }}" -{% endif %} - - type: ConfigChange - - type: ImageChange diff --git a/roles/openshift-apps/containers/templates/imagestream.yml b/roles/openshift-apps/containers/templates/imagestream.yml deleted file mode 100644 index aa40ec4289..0000000000 --- a/roles/openshift-apps/containers/templates/imagestream.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -apiVersion: v1 -kind: ImageStream -metadata: - name: containers -spec: - lookupPolicy: - local: false -status: - dockerImageRepository: "" ---- -apiVersion: v1 -kind: ImageStream -metadata: - name: s2i-golang -spec: - lookupPolicy: - local: false - tags: - - from: - kind: DockerImage - name: quay.io/osas/s2i-golang - importPolicy: {} - name: latest - referencePolicy: - type: Source -status: - dockerImageRepository: "" diff --git a/roles/openshift-apps/coreos/files/deploymentconfig.yml b/roles/openshift-apps/coreos/files/deploymentconfig.yml deleted file mode 100644 index 9c5d78b17b..0000000000 --- a/roles/openshift-apps/coreos/files/deploymentconfig.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -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 diff --git a/roles/openshift-apps/coreos/files/service.yml b/roles/openshift-apps/coreos/files/service.yml deleted file mode 100644 index e3ff616df1..0000000000 --- a/roles/openshift-apps/coreos/files/service.yml +++ /dev/null @@ -1,16 +0,0 @@ -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 - diff --git a/roles/openshift-apps/coreos/templates/buildconfig.yml b/roles/openshift-apps/coreos/templates/buildconfig.yml deleted file mode 100644 index 6626314091..0000000000 --- a/roles/openshift-apps/coreos/templates/buildconfig.yml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: BuildConfig -metadata: - name: coreos-build - labels: - 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: -{% if coreos_github_secret is defined %} - - type: GitHub - github: - secret: "{{ coreos_github_secret }}" -{% endif %} - -# 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 diff --git a/roles/openshift-apps/coreos/templates/imagestream.yml b/roles/openshift-apps/coreos/templates/imagestream.yml deleted file mode 100644 index 0804b5a9d2..0000000000 --- a/roles/openshift-apps/coreos/templates/imagestream.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -apiVersion: v1 -kind: ImageStream -metadata: - name: coreos -spec: - lookupPolicy: - local: false -status: - dockerImageRepository: "" ---- -apiVersion: v1 -kind: ImageStream -metadata: - name: s2i-golang -spec: - lookupPolicy: - local: false - tags: - - from: - kind: DockerImage - name: quay.io/osas/s2i-golang - importPolicy: {} - name: latest - referencePolicy: - type: Source -status: - dockerImageRepository: ""