b20bce1bf0
The initial fluentd client implementation predates the introduction of service_config_settings, and necessitated some invasive changes to what is now common/serivces.yaml. This commit modifies existing services to use the service_config_settings based configuration mechanism supported by more recent versions of the fluentd support in puppet-tripleo. Partial-bug: #1715187 Depends-On: I3149902401d68d6fd236073a73a20f982d4b952a Depends-On: I2b057190ec0e4e75ee4ee47ebe0164c2644e5ab7 Depends-On: Ie7df4b8b94cb0ae38096ab95800f211ef1cd8455 Change-Id: I28028ffa00df2da8e0478a551d3de89c3ee46e1f
89 lines
3.1 KiB
YAML
89 lines
3.1 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack Nova Vncproxy service configured with Puppet
|
|
|
|
parameters:
|
|
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
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
MonitoringSubscriptionNovaVNCProxy:
|
|
default: 'overcloud-nova-vncproxy'
|
|
type: string
|
|
NovaVncproxyLoggingSource:
|
|
type: json
|
|
default:
|
|
tag: openstack.nova.vncproxy
|
|
path: /var/log/nova/nova-vncproxy.log
|
|
|
|
resources:
|
|
NovaBase:
|
|
type: ./nova-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Nova Vncproxy service.
|
|
value:
|
|
service_name: nova_vnc_proxy
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaVNCProxy}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [NovaBase, role_data, config_settings]
|
|
- nova::vncproxy::enabled: true
|
|
nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyPublic, protocol]}
|
|
nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyPublic, host_nobrackets]}
|
|
nova::vncproxy::common::vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]}
|
|
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
|
|
# for the given network; replacement examples (eg. for internal_api):
|
|
# internal_api -> IP
|
|
# internal_api_uri -> [IP]
|
|
# internal_api_subnet - > IP/CIDR
|
|
nova::vncproxy::host: {get_param: [ServiceNetMap, NovaApiNetwork]}
|
|
tripleo.nova_vnc_proxy.firewall_rules:
|
|
'137 nova_vnc_proxy':
|
|
dport:
|
|
- 6080
|
|
- 13080
|
|
service_config_settings:
|
|
fluentd:
|
|
tripleo_fluentd_groups_nova_vnc_proxy:
|
|
- nova
|
|
tripleo_fluentd_sources_nova_vnc_proxy:
|
|
- {get_param: NovaVncproxyLoggingSource}
|
|
step_config: |
|
|
include tripleo::profile::base::nova::vncproxy
|
|
upgrade_tasks:
|
|
- name: Stop nova_vnc_proxy service
|
|
when: step|int == 1
|
|
service: name=openstack-nova-consoleauth state=stopped
|