Refactor zuul group_vars

We can cut down on some logic if we first disable all zuul services,
then only enabled what we need for each host.

Change-Id: I437a8f80f4dedb4e46074cfbc47310cd8455b237
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-12-21 20:19:32 -05:00
parent b8821015c6
commit a83b7a5cdb
6 changed files with 60 additions and 130 deletions

View File

@ -15,33 +15,12 @@
# windmill.zuul
zuul_file_zuul_executor_service_config_src: zuul/etc/systemd/system/zuul-executor.service.d/override.conf.j2
zuul_file_zuul_fingergw_service_config_manage: false
zuul_file_zuul_fingergw_service_manage: false
zuul_file_zuul_executor_service_config_manage: true
zuul_file_zuul_executor_service_manage: true
zuul_file_zuul_merger_service_config_manage: false
zuul_file_zuul_merger_service_manage: false
zuul_file_zuul_scheduler_service_config_manage: false
zuul_file_zuul_scheduler_service_manage: false
zuul_file_zuul_web_service_config_manage: false
zuul_file_zuul_web_service_manage: false
zuul_service_zuul_fingergw_enabled: false
zuul_service_zuul_fingergw_manage: false
zuul_service_zuul_fingergw_state: stopped
zuul_service_zuul_merger_enabled: false
zuul_service_zuul_merger_manage: false
zuul_service_zuul_merger_state: stopped
zuul_service_zuul_scheduler_enabled: false
zuul_service_zuul_scheduler_manage: false
zuul_service_zuul_scheduler_state: stopped
zuul_service_zuul_web_enabled: false
zuul_service_zuul_web_manage: false
zuul_service_zuul_web_state: stopped
zuul_service_zuul_executor_enabled: true
zuul_service_zuul_executor_manage: true
zuul_service_zuul_executor_state: started
# openstack.logrotate
logrotate_configs:

View File

@ -13,33 +13,12 @@
# under the License.
---
# windmill.zuul
zuul_file_zuul_executor_service_config_manage: false
zuul_file_zuul_executor_service_manage: false
zuul_file_zuul_fingergw_service_config_manage: true
zuul_file_zuul_fingergw_service_manage: true
zuul_file_zuul_merger_service_config_manage: false
zuul_file_zuul_merger_service_manage: false
zuul_file_zuul_scheduler_service_config_manage: false
zuul_file_zuul_scheduler_service_manage: false
zuul_file_zuul_web_service_config_manage: false
zuul_file_zuul_web_service_manage: false
zuul_service_zuul_executor_enabled: false
zuul_service_zuul_executor_manage: false
zuul_service_zuul_executor_state: stopped
zuul_service_zuul_merger_enabled: false
zuul_service_zuul_merger_manage: false
zuul_service_zuul_merger_state: stopped
zuul_service_zuul_scheduler_enabled: false
zuul_service_zuul_scheduler_manage: false
zuul_service_zuul_scheduler_state: stopped
zuul_service_zuul_web_enabled: false
zuul_service_zuul_web_manage: false
zuul_service_zuul_web_state: stopped
zuul_service_zuul_fingergw_enabled: true
zuul_service_zuul_fingergw_manage: true
zuul_service_zuul_fingergw_state: started
# openstack.logrotate
logrotate_configs:

View File

@ -15,33 +15,12 @@
# windmill.zuul
zuul_file_zuul_merger_service_config_src: zuul/etc/systemd/system/zuul-merger.service.d/override.conf.j2
zuul_file_zuul_executor_service_config_manage: false
zuul_file_zuul_executor_service_manage: false
zuul_file_zuul_merger_service_config_manage: true
zuul_file_zuul_merger_service_manage: true
zuul_file_zuul_fingergw_service_config_manage: false
zuul_file_zuul_fingergw_service_manage: false
zuul_file_zuul_scheduler_service_config_manage: false
zuul_file_zuul_scheduler_service_manage: false
zuul_file_zuul_web_service_config_manage: false
zuul_file_zuul_web_service_manage: false
zuul_service_zuul_executor_enabled: false
zuul_service_zuul_executor_manage: false
zuul_service_zuul_executor_state: stopped
zuul_service_zuul_fingergw_enabled: false
zuul_service_zuul_fingergw_manage: false
zuul_service_zuul_fingergw_state: stopped
zuul_service_zuul_scheduler_enabled: false
zuul_service_zuul_scheduler_manage: false
zuul_service_zuul_scheduler_state: stopped
zuul_service_zuul_web_enabled: false
zuul_service_zuul_web_manage: false
zuul_service_zuul_web_state: stopped
zuul_service_zuul_merger_enabled: true
zuul_service_zuul_merger_manage: true
zuul_service_zuul_merger_state: started
# openstack.logrotate
logrotate_configs:

View File

@ -15,33 +15,12 @@
# windmill.zuul
zuul_file_zuul_scheduler_service_config_src: zuul/etc/systemd/system/zuul-scheduler.service.d/override.conf.j2
zuul_file_zuul_executor_service_config_manage: false
zuul_file_zuul_executor_service_manage: false
zuul_file_zuul_scheduler_service_config_manage: true
zuul_file_zuul_scheduler_service_manage: true
zuul_file_zuul_fingergw_service_config_manage: false
zuul_file_zuul_fingergw_service_manage: false
zuul_file_zuul_merger_service_config_manage: false
zuul_file_zuul_merger_service_manage: false
zuul_file_zuul_web_service_config_manage: false
zuul_file_zuul_web_service_manage: false
zuul_service_zuul_executor_enabled: false
zuul_service_zuul_executor_manage: false
zuul_service_zuul_executor_state: stopped
zuul_service_zuul_fingergw_enabled: false
zuul_service_zuul_fingergw_manage: false
zuul_service_zuul_fingergw_state: stopped
zuul_service_zuul_merger_enabled: false
zuul_service_zuul_merger_manage: false
zuul_service_zuul_merger_state: stopped
zuul_service_zuul_web_enabled: false
zuul_service_zuul_web_manage: false
zuul_service_zuul_web_state: stopped
zuul_service_zuul_scheduler_enabled: true
zuul_service_zuul_scheduler_manage: true
zuul_service_zuul_scheduler_state: started
# openstack.logrotate
logrotate_configs:

View File

@ -15,33 +15,12 @@
# windmill.zuul
zuul_file_zuul_web_service_config_src: zuul/etc/systemd/system/zuul-web.service.d/override.conf.j2
zuul_file_zuul_executor_service_config_manage: false
zuul_file_zuul_executor_service_manage: false
zuul_file_zuul_web_service_config_manage: true
zuul_file_zuul_web_service_manage: true
zuul_file_zuul_fingergw_service_config_manage: false
zuul_file_zuul_fingergw_service_manage: false
zuul_file_zuul_merger_service_config_manage: false
zuul_file_zuul_merger_service_manage: false
zuul_file_zuul_scheduler_service_config_manage: false
zuul_file_zuul_scheduler_service_manage: false
zuul_service_zuul_executor_enabled: false
zuul_service_zuul_executor_manage: false
zuul_service_zuul_executor_state: stopped
zuul_service_zuul_fingergw_enabled: false
zuul_service_zuul_fingergw_manage: false
zuul_service_zuul_fingergw_state: stopped
zuul_service_zuul_merger_enabled: false
zuul_service_zuul_merger_manage: false
zuul_service_zuul_merger_state: stopped
zuul_service_zuul_scheduler_enabled: false
zuul_service_zuul_scheduler_manage: false
zuul_service_zuul_scheduler_state: stopped
zuul_service_zuul_web_enabled: true
zuul_service_zuul_web_manage: true
zuul_service_zuul_web_state: started
# openstack.logrotate
logrotate_configs:

View File

@ -21,6 +21,41 @@ zuul_file_zuul_conf_src: "{{ windmill_config_git_dest }}/zuul/zuul.conf.j2"
zuul_pip_virtualenv_python: python3
zuul_pip_virtualenv: /opt/venv/zuul
zuul_file_zuul_executor_service_config_manage: false
zuul_file_zuul_executor_service_manage: false
zuul_file_zuul_fingergw_service_config_manage: false
zuul_file_zuul_fingergw_service_manage: false
zuul_file_zuul_merger_service_config_manage: false
zuul_file_zuul_merger_service_manage: false
zuul_file_zuul_scheduler_service_config_manage: false
zuul_file_zuul_scheduler_service_manage: false
zuul_file_zuul_web_service_config_manage: false
zuul_file_zuul_web_service_manage: false
zuul_service_zuul_executor_enabled: false
zuul_service_zuul_executor_manage: false
zuul_service_zuul_executor_state: stopped
zuul_service_zuul_fingergw_enabled: false
zuul_service_zuul_fingergw_manage: false
zuul_service_zuul_fingergw_state: stopped
zuul_service_zuul_merger_enabled: false
zuul_service_zuul_merger_manage: false
zuul_service_zuul_merger_state: stopped
zuul_service_zuul_scheduler_enabled: false
zuul_service_zuul_scheduler_manage: false
zuul_service_zuul_scheduler_state: stopped
zuul_service_zuul_web_enabled: false
zuul_service_zuul_web_manage: false
zuul_service_zuul_web_state: stopped
zuul_file_gearman_ssl_ca_content: |
-----BEGIN CERTIFICATE-----
MIIDmjCCAoKgAwIBAgIJAN8sAUG3GR9wMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV