Merge "Simplify horizon, ipservices templates"

This commit is contained in:
Zuul 2021-04-23 19:53:48 +00:00 committed by Gerrit Code Review
commit 186ae11c97
2 changed files with 18 additions and 36 deletions

View File

@ -149,8 +149,6 @@ parameter_groups:
- MemcachedIPv6 - MemcachedIPv6
conditions: conditions:
websso_enabled: {equals : [{get_param: WebSSOEnable}, True]}
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
horizon_domain_choices_set: {not: {equals: [{get_param: HorizonDomainChoices}, []]}} horizon_domain_choices_set: {not: {equals: [{get_param: HorizonDomainChoices}, []]}}
is_ipv6: is_ipv6:
equals: equals:
@ -211,38 +209,30 @@ outputs:
horizon::timezone: {get_param: TimeZone} horizon::timezone: {get_param: TimeZone}
horizon::file_upload_temp_dir: '/var/tmp' horizon::file_upload_temp_dir: '/var/tmp'
horizon::help_url: {get_param: HorizonHelpURL} horizon::help_url: {get_param: HorizonHelpURL}
- - if:
if: - {get_param: EnableInternalTLS}
- internal_tls_enabled
- horizon::horizon_ca: {get_param: InternalTLSCAFile} - horizon::horizon_ca: {get_param: InternalTLSCAFile}
horizon::ssl_verify_client: require horizon::ssl_verify_client: require
- {} - if:
- - {get_param: WebSSOEnable}
if: - horizon::websso_enabled:
- websso_enabled get_param: WebSSOEnable
- horizon::websso_initial_choice:
horizon::websso_enabled: get_param: WebSSOInitialChoice
get_param: WebSSOEnable horizon::websso_choices:
horizon::websso_initial_choice: get_param: WebSSOChoices
get_param: WebSSOInitialChoice horizon::websso_idp_mapping:
horizon::websso_choices: get_param: WebSSOIDPMapping
get_param: WebSSOChoices - if:
horizon::websso_idp_mapping:
get_param: WebSSOIDPMapping
- {}
-
if:
- {get_param: HorizonDebug} - {get_param: HorizonDebug}
- horizon::django_debug: true - horizon::django_debug: true
- horizon::django_debug: {get_param: Debug} - horizon::django_debug: {get_param: Debug}
- if: - if:
- horizon_logger_debug - horizon_logger_debug
- horizon::log_level: 'DEBUG' - horizon::log_level: 'DEBUG'
- {}
- if: - if:
- horizon_domain_choices_set - horizon_domain_choices_set
- horizon::keystone_domain_choices: {get_param: HorizonDomainChoices} - horizon::keystone_domain_choices: {get_param: HorizonDomainChoices}
- {}
ansible_group_vars: ansible_group_vars:
keystone_enable_member: true keystone_enable_member: true
service_config_settings: service_config_settings:
@ -324,21 +314,16 @@ outputs:
volumes: volumes:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- - - /var/lib/kolla/config_files/horizon.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/kolla/config_files/horizon.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/horizon:/var/lib/kolla/config_files/src:ro - /var/lib/config-data/puppet-generated/horizon:/var/lib/kolla/config_files/src:ro
- /var/log/containers/horizon:/var/log/horizon:z - /var/log/containers/horizon:/var/log/horizon:z
- /var/log/containers/httpd/horizon:/var/log/httpd:z - /var/log/containers/httpd/horizon:/var/log/httpd:z
- /var/tmp/:/var/tmp/:z - /var/tmp/:/var/tmp/:z
- /var/www/:/var/www/:ro - /var/www/:/var/www/:ro
- if: - if:
- internal_tls_enabled - {get_param: EnableInternalTLS}
- - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- [] - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- if:
- internal_tls_enabled
- - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- []
environment: environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
# Installed plugins: # Installed plugins:

View File

@ -150,8 +150,7 @@ outputs:
become: true become: true
vars: vars:
map_merge: map_merge:
- - state: present
state: present
ipaclient_otp: "{{ hostvars[outer_item.0]['ipa_host_otp'] }}" ipaclient_otp: "{{ hostvars[outer_item.0]['ipa_host_otp'] }}"
ipaclient_mkhomedir: {get_param: MakeHomeDir} ipaclient_mkhomedir: {get_param: MakeHomeDir}
ipaclient_no_ntp: {get_param: IdMNoNtpSetup} ipaclient_no_ntp: {get_param: IdMNoNtpSetup}
@ -167,12 +166,10 @@ outputs:
ansible_distribution_release: "{{ ansible_facts['distribution_release'] }}" ansible_distribution_release: "{{ ansible_facts['distribution_release'] }}"
ansible_distribution_version: "{{ ansible_facts['distribution_version'] }}" ansible_distribution_version: "{{ ansible_facts['distribution_version'] }}"
ansible_os_family: "{{ ansible_facts['os_family'] }}" ansible_os_family: "{{ ansible_facts['os_family'] }}"
- - if:
if:
- idm_server_provided - idm_server_provided
- ipaclient_servers: {get_param: IdMServer} - ipaclient_servers: {get_param: IdMServer}
ipaclient_domain: {get_param: IdMDomain} ipaclient_domain: {get_param: IdMDomain}
- {}
when: when:
- idm_enroll_base_server|bool - idm_enroll_base_server|bool
- not outer_item.1.stat.exists - not outer_item.1.stat.exists