Merge "Enable management network in network_data"

network/config/bond-with-vlans/README.md

@@ -33,8 +33,8 @@ Same as above except set the following value for the controller role:
 Configuration with System Management Network
 --------------------------------------------
 
-The Management network is included for upgrade compatibility with
-previous versions, but disabled. To enable the optional System
+The Management network is enabled for backwards-compatibility, but
+is not included in any roles by default. To enable the optional System
 Management network, create a Heat environment that looks something like
 this:
 
@@ -50,8 +50,7 @@ Or use this Heat environment file:
 
   environments/network-management.yaml
 
-Or, enable the Management network in network_data.yaml, and add the network
-to the list of networks used by each role in the role definition file
-(e.g. roles_data.yaml). Refer to installation documentation for procedure
-to generate a role file for custom roles.
+Or, add the network to the list of networks used by each role in the role
+definition file (e.g. roles_data.yaml). Refer to installation documentation
+for procedure to generate a role file for custom roles.
 

network/config/multiple-nics/README.md

@@ -23,8 +23,8 @@ Or use this Heat environment file:
 Configuration with System Management Network
 --------------------------------------------
 
-The Management network is included for upgrade compatibility with
-previous versions, but disabled. To enable the optional System
+The Management network is enabled for backwards-compatibility, but
+is not included in any roles by default. To enable the optional System
 Management network, create a Heat environment that looks something like
 this:
 
@@ -40,8 +40,7 @@ Or use this Heat environment file:
 
   environments/network-management.yaml
 
-Or, enable the Management network in network_data.yaml, and add the network
-to the list of networks used by each role in the role definition file
-(e.g. roles_data.yaml). Refer to installation documentation for procedure
-to generate a role file for custom roles.
+Or, add the network to the list of networks used by each role in the role
+definition file (e.g. roles_data.yaml). Refer to installation documentation
+for procedure to generate a role file for custom roles.
 

network/config/single-nic-vlans/README.md

@@ -33,8 +33,8 @@ Same as above except set the following value for the controller role:
 Configuration with System Management Network
 --------------------------------------------
 
-The Management network is included for upgrade compatibility with
-previous versions, but disabled. To enable the optional System
+The Management network is enabled for backwards-compatibility, but
+is not included in any roles by default. To enable the optional System
 Management network, create a Heat environment that looks something like
 this:
 
@@ -50,7 +50,6 @@ Or use this Heat environment file:
 
   environments/network-management.yaml
 
-Or, enable the Management network in network_data.yaml, and add the network
-to the list of networks used by each role in the role definition file
-(e.g. roles_data.yaml). Refer to installation documentation for procedure
-to generate a role file for custom roles.
+Or, add the network to the list of networks used by each role in the role
+definition file (e.g. roles_data.yaml). Refer to installation documentation
+for procedure to generate a role file for custom roles.

network_data.yaml

@@ -92,11 +92,9 @@
   ipv6_allocation_pools: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]
   gateway_ipv6: '2001:db8:fd00:1000::1'
 - name: Management
-  # Management network is included for backwards-compatibility, but
-  # is not enabled or included in any role definitions by default.
-  # Include environments/network-management yaml to override, or
-  # enable this network and add it to the roles in roles_data.yaml.
-  enabled: false
+  # Management network is enabled by default for backwards-compatibility, but
+  # is not included in any roles by default. Add to role definitions to use.
+  enabled: true
   vip: false  # Management network does not use VIPs
   name_lower: management
   vlan: 60

network_data_ganesha.yaml

@@ -92,11 +92,9 @@
   ipv6_allocation_pools: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]
   gateway_ipv6: '2001:db8:fd00:1000::1'
 - name: Management
-  # Management network is included for backwards-compatibility, but
-  # is not enabled or included in any role definitions by default.
-  # Include environments/network-management yaml to override, or
-  # enable this network and add it to the roles in roles_data.yaml.
-  enabled: false
+  # Management network is enabled by default for backwards-compatibility, but
+  # is not included in any roles by default. Add to role definitions to use.
+  enabled: true
   vip: false  # Management network does not use VIPs
   name_lower: management
   vlan: 60