Merge "Simplify qdrouterd and snmp service templates"
This commit is contained in:
commit
90f3f42736
|
@ -50,7 +50,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../containers-common.yaml
|
||||||
|
|
||||||
|
@ -122,8 +121,7 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
-
|
- - /var/lib/kolla/config_files/qdrouterd.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
- /var/lib/kolla/config_files/qdrouterd.json:/var/lib/kolla/config_files/config.json:ro
|
|
||||||
- /var/lib/config-data/puppet-generated/qdrouterd:/var/lib/kolla/config_files/src:ro
|
- /var/lib/config-data/puppet-generated/qdrouterd:/var/lib/kolla/config_files/src:ro
|
||||||
- /var/lib/qdrouterd:/var/lib/qdrouterd:z
|
- /var/lib/qdrouterd:/var/lib/qdrouterd:z
|
||||||
- /var/log/containers/qdrouterd:/var/log/qdrouterd:z
|
- /var/log/containers/qdrouterd:/var/log/qdrouterd:z
|
||||||
|
|
|
@ -51,7 +51,8 @@ parameters:
|
||||||
will be taken.
|
will be taken.
|
||||||
type: string
|
type: string
|
||||||
conditions:
|
conditions:
|
||||||
snmpd_network_unset: {equals : [{get_param: SnmpdIpSubnet}, '']}
|
snmpd_network_set:
|
||||||
|
not: {equals : [{get_param: SnmpdIpSubnet}, '']}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
|
@ -60,7 +61,11 @@ outputs:
|
||||||
service_name: snmp
|
service_name: snmp
|
||||||
firewall_rules:
|
firewall_rules:
|
||||||
if:
|
if:
|
||||||
- snmpd_network_unset
|
- snmpd_network_set
|
||||||
|
- '124 snmp':
|
||||||
|
dport: 161
|
||||||
|
proto: 'udp'
|
||||||
|
source: {get_param: SnmpdIpSubnet}
|
||||||
- map_merge:
|
- map_merge:
|
||||||
repeat:
|
repeat:
|
||||||
for_each:
|
for_each:
|
||||||
|
@ -74,10 +79,6 @@ outputs:
|
||||||
dport: 161
|
dport: 161
|
||||||
proto: 'udp'
|
proto: 'udp'
|
||||||
source: <%net_cidr%>
|
source: <%net_cidr%>
|
||||||
- '124 snmp':
|
|
||||||
dport: 161
|
|
||||||
proto: 'udp'
|
|
||||||
source: {get_param: SnmpdIpSubnet}
|
|
||||||
config_settings:
|
config_settings:
|
||||||
tripleo::profile::base::snmp::snmpd_user: {get_param: SnmpdReadonlyUserName}
|
tripleo::profile::base::snmp::snmpd_user: {get_param: SnmpdReadonlyUserName}
|
||||||
tripleo::profile::base::snmp::snmpd_password: {get_param: SnmpdReadonlyUserPassword}
|
tripleo::profile::base::snmp::snmpd_password: {get_param: SnmpdReadonlyUserPassword}
|
||||||
|
|
Loading…
Reference in New Issue