Simplify placement and podman service templates
Change-Id: I8a1595cb58c136c3b64885672e65a4ef0f36273b
This commit is contained in:
ramishra
parent
098df978cf
commit
7a9cc5c831
|
|
@ -82,12 +82,10 @@ parameters:
|
|||
description: Set to True to enable debugging on all services.
|
||||
|
||||
conditions:
|
||||
placement_workers_zero: {equals : [{get_param: PlacementWorkers}, 0]}
|
||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
||||
enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
|
||||
placement_workers_set:
|
||||
not: {equals : [{get_param: PlacementWorkers}, 0]}
|
||||
|
||||
resources:
|
||||
|
||||
ApacheServiceBase:
|
||||
type: ../../deployment/apache/apache-baremetal-puppet.yaml
|
||||
properties:
|
||||
|
|
@ -132,7 +130,7 @@ outputs:
|
|||
map_merge:
|
||||
- get_attr: [PlacementLogging, config_settings]
|
||||
- apache::default_vhost: false
|
||||
- placement::keystone::authtoken::project_name: 'service'
|
||||
placement::keystone::authtoken::project_name: 'service'
|
||||
placement::keystone::authtoken::password: {get_param: PlacementPassword}
|
||||
placement::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||
placement::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||
|
|
@ -166,22 +164,18 @@ outputs:
|
|||
path: /placement
|
||||
query:
|
||||
if:
|
||||
- enable_sqlalchemy_collectd
|
||||
-
|
||||
read_default_file: /etc/my.cnf.d/tripleo.cnf
|
||||
read_default_group: tripleo
|
||||
plugin: collectd
|
||||
collectd_program_name: placement_api
|
||||
collectd_host: localhost
|
||||
-
|
||||
read_default_file: /etc/my.cnf.d/tripleo.cnf
|
||||
read_default_group: tripleo
|
||||
|
||||
-
|
||||
if:
|
||||
- placement_workers_zero
|
||||
- {}
|
||||
- placement::wsgi::apache::workers: {get_param: PlacementWorkers}
|
||||
- {get_param: EnableSQLAlchemyCollectd}
|
||||
- read_default_file: /etc/my.cnf.d/tripleo.cnf
|
||||
read_default_group: tripleo
|
||||
plugin: collectd
|
||||
collectd_program_name: placement_api
|
||||
collectd_host: localhost
|
||||
- read_default_file: /etc/my.cnf.d/tripleo.cnf
|
||||
read_default_group: tripleo
|
||||
placement::wsgi::apache::workers:
|
||||
if:
|
||||
- placement_workers_set
|
||||
- {get_param: PlacementWorkers}
|
||||
service_config_settings:
|
||||
rsyslog:
|
||||
tripleo_logging_sources_placement:
|
||||
|
|
@ -244,8 +238,7 @@ outputs:
|
|||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
- {get_attr: [PlacementLogging, volumes]}
|
||||
-
|
||||
- /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
|
||||
- - /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
|
||||
- /var/lib/config-data/placement/etc/placement/:/etc/placement/:ro
|
||||
command: "/usr/bin/bootstrap_host_exec placement su placement -s /bin/bash -c '/usr/bin/placement-manage db sync'"
|
||||
environment:
|
||||
|
|
@ -263,17 +256,12 @@ outputs:
|
|||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
- {get_attr: [PlacementLogging, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/placement_api.json:/var/lib/kolla/config_files/config.json:ro
|
||||
- - /var/lib/kolla/config_files/placement_api.json:/var/lib/kolla/config_files/config.json:ro
|
||||
- /var/lib/config-data/puppet-generated/placement:/var/lib/kolla/config_files/src: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
|
||||
placement_wait_for_service:
|
||||
|
|
@ -287,8 +275,7 @@ outputs:
|
|||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
- {get_attr: [PlacementLogging, volumes]}
|
||||
-
|
||||
- /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
|
||||
- - /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
|
||||
- /var/lib/config-data/placement/etc/placement/:/etc/placement/:ro
|
||||
- /var/lib/container-config-scripts/:/container-config-scripts/:z
|
||||
command: "/usr/bin/bootstrap_host_exec placement su placement -s /bin/bash -c '/container-config-scripts/pyshim.sh /container-config-scripts/placement_wait_for_service.py'"
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@ parameters:
|
|||
type: boolean
|
||||
|
||||
conditions:
|
||||
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
|
||||
systemd_drop_in_dependencies_enabled: {get_param: SystemdDropInDependencies}
|
||||
insecure_registry_is_set:
|
||||
not: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
|
|
@ -81,8 +81,7 @@ outputs:
|
|||
set_fact:
|
||||
container_registry_insecure_registries:
|
||||
if:
|
||||
- insecure_registry_is_empty
|
||||
- []
|
||||
- insecure_registry_is_set
|
||||
- {get_param: DockerInsecureRegistryAddress}
|
||||
container_registry_login: {get_param: ContainerImageRegistryLogin}
|
||||
# default that is overwritten by the heat -> dict conversion
|
||||
|
|
@ -125,7 +124,7 @@ outputs:
|
|||
tripleo_container_registry_login: "{{ container_registry_login | bool }}"
|
||||
|
||||
- if:
|
||||
- systemd_drop_in_dependencies_enabled
|
||||
- {get_param: SystemdDropInDependencies}
|
||||
- - name: Configure tripleo_container_manage to generate systemd drop-in dependencies
|
||||
copy:
|
||||
dest: /etc/sysconfig/podman_drop_in
|
||||
|
|
@ -180,8 +179,7 @@ outputs:
|
|||
set_fact:
|
||||
container_registry_insecure_registries:
|
||||
if:
|
||||
- insecure_registry_is_empty
|
||||
- []
|
||||
- insecure_registry_is_set
|
||||
- {get_param: DockerInsecureRegistryAddress}
|
||||
- include_role:
|
||||
name: tripleo_podman
|
||||
|
|
|
|||
Loading…
Reference in New Issue