Merge "Manila network plugin address family support"

ci/environments/network/multiple-nics-ipv6/network-isolation-absolute.yaml

@@ -33,3 +33,5 @@ parameter_defaults:
   NovaIPv6: True
   RabbitIPv6: True
   MemcachedIPv6: True
+  ManilaIPv6: True
+

ci/environments/network/multiple-nics-ipv6/network-isolation.yaml

@@ -33,3 +33,4 @@ parameter_defaults:
   NovaIPv6: True
   RabbitIPv6: True
   MemcachedIPv6: True
+  ManilaIPv6: True

environments/network-isolation-v6.j2.yaml

@@ -57,3 +57,6 @@ parameter_defaults:
   MemcachedIPv6: True
   # Enable IPv6 environment for MySQL.
   MysqlIPv6: True
+  # Enable IPv6 environment for Manila
+  ManilaIPv6: True
+

puppet/services/manila-base.yaml

@@ -30,6 +30,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ManilaIPv6:
+    default: False
+    description: Set to True to enable IPv6 access in manila.
+    type: boolean
   Debug:
     default: false
     description: Set to True to enable debugging on all services.
@@ -71,6 +75,7 @@ parameters:
 
 conditions:
   service_debug_unset: {equals : [{get_param: ManilaDebug}, '']}
+  manila_ipv6: {equals : [{get_param: ManilaIPv6}, true]}
 
 outputs:
   role_data:
@@ -100,6 +105,9 @@ outputs:
             query:
               read_default_file: /etc/my.cnf.d/tripleo.cnf
               read_default_group: tripleo
+        manila::network::neutron::network_plugin_ipv6_enabled: {get_param: ManilaIPv6}
+        # Currently the address family parameters are mutually exclusive
+        manila::network::neutron::network_plugin_ipv4_enabled: {if: ["manila_ipv6", false, true]}
       service_config_settings:
         mysql:
           manila::db::mysql::password: {get_param: ManilaPassword}