096fa87741
Previously the kolla config is merging the existing apache configuration files in the container with our generated ones. This can lead to extra configurations in the containers that we are not expecting. This change updates the kolla configs to not merge the httpd conf.d folder so we only end up with our expected configurations. Change-Id: Ibb9bbeb12e73b2cf8887554f461873e42532edd7 Related-Bug: 1813084
147 lines
4.8 KiB
YAML
147 lines
4.8 KiB
YAML
heat_template_version: rocky
|
|
|
|
description: >
|
|
Openstack containerized TripleO UI service
|
|
|
|
parameters:
|
|
DockerTripleoUIImage:
|
|
description: image
|
|
type: string
|
|
DockerTripleoUIConfigImage:
|
|
description: The container image to use for the tripleo-ui config_volume
|
|
type: string
|
|
TripleoUILoggingSource:
|
|
type: json
|
|
default:
|
|
tag: openstack.tripleo.ui
|
|
path: /var/log/containers/httpd/tripleo-ui/ui.log
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
type: json
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
type: json
|
|
EnableInternalTLS:
|
|
type: boolean
|
|
default: false
|
|
UpgradeRemoveUnusedPackages:
|
|
default: false
|
|
description: Remove package if the service is being disabled during upgrade
|
|
type: boolean
|
|
|
|
conditions:
|
|
|
|
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ./containers-common.yaml
|
|
|
|
TripleoUIPuppetBase:
|
|
type: ../../puppet/services/tripleo-ui.yaml
|
|
properties:
|
|
EndpointMap: {get_param: EndpointMap}
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the TripleO UI role.
|
|
value:
|
|
service_name: {get_attr: [TripleoUIPuppetBase, role_data, service_name]}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [TripleoUIPuppetBase, role_data, config_settings]
|
|
- apache::default_vhost: false
|
|
service_config_settings: {get_attr: [TripleoUIPuppetBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: tripleo-ui
|
|
step_config: {get_attr: [TripleoUIPuppetBase, role_data, step_config]}
|
|
config_image: {get_param: DockerTripleoUIConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/tripleo_ui.json:
|
|
command: /usr/sbin/httpd -DFOREGROUND
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/etc/httpd/conf.d"
|
|
dest: "/etc/httpd/conf.d"
|
|
merge: false
|
|
preserve_properties: true
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
docker_config:
|
|
step_4:
|
|
tripleo_ui:
|
|
image: {get_param: DockerTripleoUIImage}
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/tripleo_ui.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/tripleo-ui/:/var/lib/kolla/config_files/src:ro
|
|
- /var/log/containers/httpd/tripleo-ui:/var/log/httpd
|
|
-
|
|
if:
|
|
- internal_tls_enabled
|
|
- /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
|
|
- ''
|
|
environment:
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
host_prep_tasks:
|
|
- name: create persistent logs directory
|
|
file:
|
|
path: "{{ item }}"
|
|
state: directory
|
|
with_items:
|
|
- /var/log/containers/httpd/tripleo-ui
|
|
upgrade_tasks:
|
|
- when: step|int == 2
|
|
block:
|
|
- name: Remove openstack-tripleo-ui package if operator requests it
|
|
package: name=openstack-tripleo-ui state=removed
|
|
ignore_errors: True
|
|
when: {get_param: UpgradeRemoveUnusedPackages}
|
|
post_upgrade_tasks:
|
|
- when: step|int == 1
|
|
import_role:
|
|
name: tripleo-docker-rm
|
|
vars:
|
|
containers_to_rm:
|
|
- tripleo_ui
|
|
metadata_settings:
|
|
get_attr: [TripleoUIPuppetBase, role_data, metadata_settings]
|