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

greenwave: skip openshift/project role temporarily due to #6404

Browse source 
Also update the buildconfig.yaml to use the latest package
This commit is contained in:
Matt Jia 2017-10-04 13:34:15 +10:00
parent ab6a25d549
commit d391b40050
No known key found for this signature in database
GPG key ID: 496C2CDC1EF01F5D
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playbooks/openshift-apps/greenwave.yml
View file

@ -9,7 +9,9 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- { role: openshift/project, app: greenwave, description: greenwave, fas_owner: codeblock } # The openshift/project role breaks if the project already exists:
# https://pagure.io/fedora-infrastructure/issue/6404
#- { role: openshift/project, app: greenwave, description: greenwave, fas_owner: codeblock }
- { role: openshift/object, app: greenwave, file: imagestream.yml } - { role: openshift/object, app: greenwave, file: imagestream.yml }
- { role: openshift/object, app: greenwave, template: buildconfig.yml } - { role: openshift/object, app: greenwave, template: buildconfig.yml }
- { role: openshift/start-build, app: greenwave, name: greenwave-docker-build } - { role: openshift/start-build, app: greenwave, name: greenwave-docker-build }

2
roles/openshift-apps/greenwave/templates/buildconfig.yml
View file

@ -19,7 +19,7 @@ spec:
PyYAML \ PyYAML \
python2-flask python2-flask
RUN yum -y install --setopt=tsflags=nodocs \ RUN yum -y install --setopt=tsflags=nodocs \
https://kojipkgs.fedoraproject.org//packages/greenwave/0.1.1/6.497594f.fc26/noarch/greenwave-0.1.1-6.497594f.fc26.noarch.rpm https://kojipkgs.fedoraproject.org//packages/greenwave/0.3/1.fc26/noarch/greenwave-0.3-1.fc26.noarch.rpm
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app
strategy: strategy: