vars cleanup

README.md

@@ -31,14 +31,13 @@ mbs_config_env: "{{ mbs_config_type }}" #
 mbs_config_secret_key: a1b2c3d4 #
 mbs_config_database_url: mbs database url
 mbs_config_system: mbs build system, defaults to "koji"
-mbs_config_messaging: mbs messaging backend type, defaults to "in_memory"
+mbs_config_messaging: mbs messaging backend type, defaults to "fedmsg"
 mbs_config_messaging_topic_prefix: 'org.centos.mbs' #
 mbs_config_koji_file: path to the mbs koji conf file, defaulta to  /etc/module-build-service/koji.conf
 mbs_config_koji_profile: mbs koji profile to use, defaults to "koji"
 mbs_config_arches: a list of supported archs by this mbs instance
 mbs_config_koji_proxy_user: true #
 mbs_config_koji_repository_url: koji repos url
-mbs_config_copr_file: mbs copr conf file, defaults to /etc/module-build-service/copr.conf
 mbs_config_scm_urls: a list of allowed git urls for mbs to pull modules from
 mbs_config_polling_interval: mbs polling interval for mbs-poller
 mbs_config_default_repository_url: mbs defautl rpm repositories url
@@ -58,12 +57,6 @@ mbs_config_allowed_groups: list of allowed groups to build a moduke
 mbs_config_admin_groups: list of admin groups
 mbs_config_rebuild_strategy: mbs rebuild strategy, defaults to only-changed
 mbs_config_rebuild_strategy_override: boolean flag to enable/disable a user to override the rebuild strategy type 
-mbs_config_base_module_arches: a dict of base arches per plataform, example bellow:
-  platform:el8:
-    - aarch64
-    - ppc64le
-    - x86_64
-    - s390x
 mbs_config_base_module_names: a list of base module names
 mbs_config_koji_build_tag: modular-updates-candidate
 mbs_config_koji_tag_prefixes: a list of koji tag prefixes to be used by mbs

defaults/main.yml

@@ -1,14 +1,10 @@
 ---
 # defaults file for mbs
 mbs_cert_prefix: mbs
-mbs_config_type: production
 mbs_import_default_modules: true
 mbs_upgrade_db: true
 mbs_num_workers: 3
 mbs_celery_max_worker_tasks: 10
-mbs_mq_cert: ''
-mbs_mq_key: ''
-mbs_mq_ca: ''
 mbs_default_modules_dir: default-modules
 # rabbitmq
 rabbitmq_local: true
@@ -23,18 +19,17 @@ kojihub_kerberos_rdns: false
 #mbs config.py
 mbs_config_broker_url: 'amqp://{{ rabbitmq_username }}@{{ rabbitmq_password }}:localhost:5627/{{ rabbitmq_vhost }}'
 mbs_config_debug: false
-mbs_config_env: "{{ mbs_config_type }}"
 mbs_config_secret_key: a1b2c3d4
 mbs_config_database_url: postgresql://mbs:mbs@localhost/mbs
 mbs_config_system: koji
-mbs_config_messaging: in_memory
+mbs_config_messaging: fedmsg
 mbs_config_messaging_topic_prefix: ['org.centos.prod']
 mbs_config_koji_file: /etc/module-build-service/koji.conf
 mbs_config_koji_profile: koji
 mbs_config_arches:
   - x86_64
 mbs_config_koji_proxy_user: true
-mbs_config_koji_repository_url: https://kojipkgs.stg.fedoraproject.org/repos
+mbs_config_koji_repository_url: https://cbs.centos.org/repos
 mbs_config_scm_urls: []
 mbs_config_polling_interval: 3600
 mbs_config_default_repository_url: 'git+https://git.centos.org/rpms/'
@@ -48,7 +43,7 @@ mbs_config_log_file: /var/log/mbs/module_build_service.log
 mbs_config_log_level: info
 mbs_config_logs_build_dir: /var/tmp
 mbs_config_krb_keytab: /etc/krb5.mbs_mbs{{ mbs_config_env }}.centos.org.keytab
-mbs_config_krb_principal: mbs/mbs.centos.org@CENTOS.ORG
+mbs_config_krb_principal: cbs-koji@DEV.CENTOS.ORG
 mbs_config_allowed_groups:
   - packager
 mbs_config_admin_groups:
@@ -57,12 +52,6 @@ mbs_config_admin_groups:
 mbs_config_allowed_users: []
 mbs_config_rebuild_strategy: only-changed
 mbs_config_rebuild_strategy_override: true
-mbs_config_base_module_arches:
-  platform:el8:
-    - aarch64
-    - ppc64le
-    - x86_64
-    - s390x
 mbs_config_resolver: db
 mbs_config_content_generator: true
 mbs_config_base_module_names:

tasks/mbs-backend.yml

@@ -78,33 +78,6 @@
     owner: fedmsg
     group: fedmsg
     mode: 0750
-
-- name: copy the MBS rabbitmq private queue crt
-  copy:
-    src: "{{ mbs_mq_cert }}"
-    dest: /etc/module-build-service/mbs-private-queue.crt
-    owner: root
-    group: fedmsg
-    mode: 0640
-  when: mbs_mq_cert
-  
-- name: copy the MBS rabbitmq private queue key
-  copy:
-    src: "{{ mbs_mq_key }}"
-    dest: /etc/module-build-service/mbs-private-queue.key
-    owner: root
-    group: fedmsg
-    mode: 0640
-  when: mbs_mq_key
-  
-- name: copy the MBS rabbitmq CA cert
-  copy:
-    src: "{{ mbs_mq_ca }}"
-    dest: /etc/module-build-service/ca.crt
-    owner: root
-    group: fedmsg
-    mode: 0640
-  when: mbs_mq_ca
   
 - name: Add the systemd service files
   template: