mysql: move firewall_rules to mysql-container-puppet

The firewall_rules need to be in the service template and can't be in
the base, that is imported.
The current YAQL is looking for firewall_rules in the role_data:
$.data.role_data, []).where($ != null).select($.get('firewall_rules')

So moving the firewall_rules from mysql-base to mysql-container-puppet
will allow the data to be found by the query and the firewall rules to
be applied.

Change-Id: I6183cdf63ea628cc86742d56b5e2cc0ec5e3aab9
Closes-Bug: #1856864
This commit is contained in:
Emilien Macchi 2019-12-18 10:47:31 -05:00
parent 937e3ef226
commit 7c2fa7b8e9
2 changed files with 9 additions and 9 deletions

View File

@ -68,15 +68,6 @@ outputs:
description: Service MySQL using composable services.
value:
service_name: mysql
firewall_rules:
'104 mysql galera':
dport:
- 873
- 3306
- 4444
- 4567
- 4568
- 9200
config_settings:
map_merge:
-

View File

@ -73,6 +73,15 @@ outputs:
description: Containerized service MySQL using composable services.
value:
service_name: {get_attr: [MysqlBase, role_data, service_name]}
firewall_rules:
'104 mysql':
dport:
- 873
- 3306
- 4444
- 4567
- 4568
- 9200
config_settings:
map_merge:
- {get_attr: [MysqlBase, role_data, config_settings]}