diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-04 08:38:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-04 08:38:40 +0000 |
| commit | 2f092f5c8f107d3a3fea48e0fc96f140acc41aa3 (patch) | |
| tree | 1bea0ca0a5d8a32b243ab7458722132a1d653e17 | |
| parent | 97ef5a574d3df23b68dd2a9eaa66a7923fce8d39 (diff) | |
| parent | 34c286a9abf72f91b4ce005c3b1ee0472fb22567 (diff) | |
Merge "mysql: expose IPv6 configuration to mysql puppet modules" into stable/pike
| -rw-r--r-- | environments/network-isolation-v6.j2.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/database/mysql.yaml | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml index 617dfa61..fefa20ce 100644 --- a/environments/network-isolation-v6.j2.yaml +++ b/environments/network-isolation-v6.j2.yaml @@ -55,3 +55,5 @@ parameter_defaults: RabbitIPv6: True # Enable IPv6 environment for Memcached. MemcachedIPv6: True + # Enable IPv6 environment for MySQL. + MysqlIPv6: True diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml index abbe7a22..7cc8fd39 100644 --- a/puppet/services/database/mysql.yaml +++ b/puppet/services/database/mysql.yaml @@ -57,6 +57,11 @@ parameters: EnableInternalTLS: type: boolean default: false + MysqlIPv6: + default: false + description: Enable IPv6 in MySQL + type: boolean + conditions: @@ -77,6 +82,7 @@ outputs: # in tripleo-puppet-elements. mysql::server::package_name: 'mariadb-galera-server' mysql::server::manage_config_file: true + mysql_ipv6: {get_param: MysqlIPv6} tripleo.mysql.firewall_rules: '104 mysql galera': dport: |