Uprade odcs-stg to latest ODCS
This commit is contained in:
parent
d039188574
commit
683c3023f9
5 changed files with 51 additions and 23 deletions
|
@ -85,7 +85,7 @@
|
|||
delegate_to: noc01.phx2.fedoraproject.org
|
||||
ignore_errors: true
|
||||
- name: Stop the odcs backend
|
||||
service: name="odcs-backend" state=stopped
|
||||
service: name="fedmsg-hub" state=stopped
|
||||
|
||||
roles:
|
||||
- odcs/base
|
||||
|
@ -93,7 +93,7 @@
|
|||
|
||||
post_tasks:
|
||||
- name: Start the odcs backend
|
||||
service: name="odcs-backend" state=started
|
||||
service: name="fedmsg-hub" state=started
|
||||
- name: tell nagios to unshush w.r.t. the backend
|
||||
nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
|
||||
delegate_to: noc01.phx2.fedoraproject.org
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
group: odcs
|
||||
mode: 0440
|
||||
notify:
|
||||
- restart odcs-backend
|
||||
- restart fedmsg-hub
|
||||
tags:
|
||||
- odcs
|
||||
- odcs/backend
|
||||
|
@ -34,7 +34,7 @@
|
|||
groups: apache
|
||||
append: true
|
||||
notify:
|
||||
- restart odcs-backend
|
||||
- restart fedmsg-hub
|
||||
tags:
|
||||
- odcs
|
||||
- odcs/backend
|
||||
|
|
|
@ -31,6 +31,7 @@ runroot_channel = "compose"
|
|||
runroot = False
|
||||
{%- endif %}
|
||||
|
||||
|
||||
# PDC settings
|
||||
pdc_url = '{{ config.pdc_url }}'
|
||||
pdc_insecure = {{ config.pdc_insecure }}
|
||||
|
@ -40,19 +41,21 @@ pdc_develop = {{ config.pdc_develop }}
|
|||
{%- if config.pkgset_source == 'repos' %}
|
||||
pkgset_source = 'repos'
|
||||
pkgset_repos = {
|
||||
{%- for arch in config.arches %}
|
||||
'{{ arch }}': ['{{ config.source }}',],
|
||||
{%- endfor %}
|
||||
}
|
||||
{%- elif config.pkgset_source == 'koji' %}
|
||||
pkgset_source = 'koji'
|
||||
pkgset_koji_tag = '{{ config.koji_tag }}'
|
||||
pkgset_koji_inherit = {{ config.pkgset_koji_inherit }}
|
||||
{%- endif %}
|
||||
|
||||
filter_system_release_packages = False
|
||||
|
||||
# GATHER
|
||||
{%- for arch in config.arches %}
|
||||
'{{ arch }}': ['{{ config.source }}',],
|
||||
{%- endfor %}
|
||||
}
|
||||
{%- elif config.pkgset_source == 'koji' %}
|
||||
pkgset_source = 'koji'
|
||||
{%- if config.koji_tag %}
|
||||
pkgset_koji_tag = '{{ config.koji_tag }}'
|
||||
{%- endif %}
|
||||
pkgset_koji_inherit = {{ config.pkgset_koji_inherit }}
|
||||
{%- endif %}
|
||||
|
||||
filter_system_release_packages = False
|
||||
|
||||
# GATHER
|
||||
gather_source = '{{ config.gather_source }}'
|
||||
gather_method = '{{ config.gather_method }}'
|
||||
{%- if config.comps_file %}
|
||||
|
@ -86,14 +89,10 @@ skip_phases = [
|
|||
"live_images",
|
||||
"ostree"]
|
||||
|
||||
link_type = 'symlink'
|
||||
|
||||
translate_paths = [
|
||||
{%- if config.koji_profile == "odcs_stg" %}
|
||||
('/mnt/koji/compose/', 'http://kojipkgs.stg.fedoraproject.org/compose/'),
|
||||
{%- else %}
|
||||
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
|
||||
{%- endif %}
|
||||
]
|
||||
|
||||
koji_profile = '{{ config.koji_profile }}'
|
||||
|
||||
|
||||
|
|
|
@ -3,3 +3,7 @@
|
|||
service:
|
||||
name: "odcs-backend"
|
||||
state: restarted
|
||||
- name: restart fedmsg-hub
|
||||
service:
|
||||
name: fedmsg-hub
|
||||
state: restarted
|
||||
|
|
|
@ -114,6 +114,15 @@ class ProdConfiguration(BaseConfiguration):
|
|||
|
||||
SIGKEYS = {{ odcs_sigkeys }}
|
||||
|
||||
MESSAGING_BACKEND = "{{ odcs_messaging_backend }}"
|
||||
MESSAGING_BROKER_URLS = {{ odcs_messaging_producer_broker_urls }}
|
||||
MESSAGING_CERT_FILE = "/etc/ssl/odcs/umb-client.crt"
|
||||
MESSAGING_KEY_FILE = "/etc/ssl/odcs/umb-client.key"
|
||||
MESSAGING_CA_CERT = "{{ odcs_messaging_ca_cert }}"
|
||||
MESSAGING_TOPIC_PREFIX = "{{ odcs_messaging_topic_prefix }}"
|
||||
MESSAGING_TOPIC = "VirtualTopic.eng.odcs.state.change"
|
||||
INTERNAL_MESSAGING_TOPIC = "VirtualTopic.eng.odcs.internal.msg"
|
||||
|
||||
PUNGI_RUNROOT_ENABLED = {{ odcs_pungi_runroot_enabled }}
|
||||
PUNGI_PARENT_RUNROOT_CHANNEL = "{{ odcs_pungi_parent_runroot_channel }}"
|
||||
PUNGI_PARENT_RUNROOT_PACKAGES = {{ odcs_pungi_parent_runroot_packages }}
|
||||
|
@ -124,3 +133,19 @@ class ProdConfiguration(BaseConfiguration):
|
|||
PUNGI_RUNROOT_TARGET_DIR = "{{ odcs_pungi_runroot_target_dir }}"
|
||||
PUNGI_RUNROOT_TARGET_DIR_URL = "{{ odcs_pungi_runroot_target_dir_url }}"
|
||||
|
||||
{% if odcs_allowed_source_types %}
|
||||
ALLOWED_SOURCE_TYPES = {{ odcs_allowed_source_types }}
|
||||
{% endif %}
|
||||
{% if odcs_allowed_flags %}
|
||||
ALLOWED_FLAGS = {{ odcs_allowed_flags }}
|
||||
{% endif %}
|
||||
{% if odcs_allowed_arches %}
|
||||
ALLOWED_ARCHES = {{ odcs_allowed_arches }}
|
||||
{% endif %}
|
||||
{% if odcs_allowed_results %}
|
||||
ALLOWED_RESULTS = {{ odcs_allowed_results }}
|
||||
{% endif %}
|
||||
{% if odcs_allowed_sources %}
|
||||
ALLOWED_SOURCES = {{ odcs_allowed_sources }}
|
||||
{% endif %}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue