Fix for SoftLayer network creation

perfectsine · perfectsine · commit b15a596bf4c7 · 2013-12-23T10:30:56.000-06:00
Bring it inline with documentation.
diff --git a/README.md b/README.md
@@ -113,8 +113,8 @@ It is not recommended to change the physical network configuration unless you ha
 * `node['neutron']['network']['public_nameserver_2']` - Publicly accessible name server 2
 * `node['neutron']['network']['private_nameserver_1']` - Private network name server 1
 * `node['neutron']['network']['private_nameserver_2']` - Private network name server 2
-* `node['neutron']['network']['softlayer_private_portable']` - CIDR mask of portable private IP block ordered from SoftLayer
-* `node['neutron']['network']['softlayer_public_portable']` - CIDR mask of portable public IP block ordered from SoftLayer
+* `node['neutron']['softlayer_private_portable']` - CIDR mask of portable private IP block ordered from SoftLayer
+* `node['neutron']['softlayer_public_portable']` - CIDR mask of portable public IP block ordered from SoftLayer
 
 
 ### Cinder ###
diff --git a/attributes/neutron.rb b/attributes/neutron.rb
@@ -58,7 +58,7 @@
 default['neutron']['network']['public_nameserver_2'] = '8.8.4.4'
 default['neutron']['network']['private_nameserver_1'] = '10.0.80.11'
 default['neutron']['network']['private_nameserver_2'] = '10.0.80.12'
-default['neutron']['network']['softlayer_private_portable'] = nil
-default['neutron']['network']['softlayer_public_portable'] = nil
-
 default['neutron']['network']['security_group_name'] = 'basic-ssh-icmp'
+
+default['neutron']['softlayer_private_portable'] = nil
+default['neutron']['softlayer_public_portable'] = nil
diff --git a/recipes/neutron-network.rb b/recipes/neutron-network.rb
@@ -89,19 +89,19 @@
 keystone_auth_url = "http://#{node[:keystone][:private_ip]}:" \
                     "#{node['keystone']['config']['public_port']}/v2.0"
 
-if (node['neutron']['network']['softlayer_private_portable'] \
-    && node['neutron']['network']['softlayer_public_portable'])
+if (node['neutron']['softlayer_private_portable'] \
+    && node['neutron']['softlayer_public_portable'])
 
   # Calculate the SoftLayer local subnet information
   require 'ipaddr'
 
-  sl_private = IPAddr.new(node['neutron']['network']['softlayer_private_portable'])
+  sl_private = IPAddr.new(node['neutron']['softlayer_private_portable'])
   range = sl_private.to_range.to_a
   sl_private_router = range[1]  # Gateway for SoftLayer bridged network
   sl_private_host_start = range[2]  # Starting and ending OpenStack allocatable IPs
   sl_private_host_end = range[-2]
 
-  sl_public = IPAddr.new(node['neutron']['network']['softlayer_public_portable'])
+  sl_public = IPAddr.new(node['neutron']['softlayer_public_portable'])
   range = sl_public.to_range.to_a
   sl_public_router = range[1]  #Gateway for L3 router.
 
@@ -149,7 +149,7 @@
         --dns-nameserver #{node_network['public_nameserver_1']} \
         --dns-nameserver #{node_network['public_nameserver_2']} \
         #{node_network['public_network_name']} \
-        #{node_network['softlayer_public_portable']}
+        #{node['neutron']['softlayer_public_portable']}
 
       # Private network based on bridge (no router)
       neutron net-create #{node_network['private_network_name']} \
@@ -164,7 +164,7 @@
         --dns-nameserver #{node_network['private_nameserver_1']} \
         --dns-nameserver #{node_network['private_nameserver_2']} \
         #{node_network['private_network_name']} \
-        #{node_network['softlayer_private_portable']}
+        #{node['neutron']['softlayer_private_portable']}
 
       neutron router-create \
         #{node_network['public_l3_router_name']}
