Browse Source

Merge "Simplify horizon, ipservices templates"

changes/66/785666/2
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
186ae11c97
2 changed files with 18 additions and 36 deletions
  1. +16
    -31
      deployment/horizon/horizon-container-puppet.yaml
  2. +2
    -5
      deployment/ipa/ipaservices-baremetal-ansible.yaml

+ 16
- 31
deployment/horizon/horizon-container-puppet.yaml View File

@ -149,8 +149,6 @@ parameter_groups:
- MemcachedIPv6
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}, []]}}
is_ipv6:
equals:
@ -211,38 +209,30 @@ outputs:
horizon::timezone: {get_param: TimeZone}
horizon::file_upload_temp_dir: '/var/tmp'
horizon::help_url: {get_param: HorizonHelpURL}
-
if:
- internal_tls_enabled
- if:
- {get_param: EnableInternalTLS}
- horizon::horizon_ca: {get_param: InternalTLSCAFile}
horizon::ssl_verify_client: require
- {}
-
if:
- websso_enabled
-
horizon::websso_enabled:
get_param: WebSSOEnable
horizon::websso_initial_choice:
get_param: WebSSOInitialChoice
horizon::websso_choices:
get_param: WebSSOChoices
horizon::websso_idp_mapping:
get_param: WebSSOIDPMapping
- {}
-
if:
- if:
- {get_param: WebSSOEnable}
- horizon::websso_enabled:
get_param: WebSSOEnable
horizon::websso_initial_choice:
get_param: WebSSOInitialChoice
horizon::websso_choices:
get_param: WebSSOChoices
horizon::websso_idp_mapping:
get_param: WebSSOIDPMapping
- if:
- {get_param: HorizonDebug}
- horizon::django_debug: true
- horizon::django_debug: {get_param: Debug}
- if:
- horizon_logger_debug
- horizon::log_level: 'DEBUG'
- {}
- if:
- horizon_domain_choices_set
- horizon::keystone_domain_choices: {get_param: HorizonDomainChoices}
- {}
ansible_group_vars:
keystone_enable_member: true
service_config_settings:
@ -324,21 +314,16 @@ outputs:
volumes:
list_concat:
- {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/log/containers/horizon:/var/log/horizon:z
- /var/log/containers/httpd/horizon:/var/log/httpd:z
- /var/tmp/:/var/tmp/:z
- /var/www/:/var/www/:ro
- if:
- internal_tls_enabled
- {get_param: EnableInternalTLS}
- - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- []
- if:
- internal_tls_enabled
- - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- []
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
# Installed plugins:


+ 2
- 5
deployment/ipa/ipaservices-baremetal-ansible.yaml View File

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


Loading…
Cancel
Save