Merge "Add 'storage' L3 attributes for Ceph"
diff --git "a/\173\043 interfaces \043\175/bond0_ab_ceph_control_backend" "b/\173\043 interfaces \043\175/bond0_ab_vlan_ceph_storage_backend"
similarity index 82%
rename from "\173\043 interfaces \043\175/bond0_ab_ceph_control_backend"
rename to "\173\043 interfaces \043\175/bond0_ab_vlan_ceph_storage_backend"
index ddccf20..06b2c34 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_ceph_control_backend"
+++ "b/\173\043 interfaces \043\175/bond0_ab_vlan_ceph_storage_backend"
@@ -37,22 +37,22 @@
{%- endfor %}
# bond for cluster communication on _param:public_network
bond0.1:
- name: bond1.${_param:control_vlan}
+ name: bond1.${_param:_esc}{_param:storage_vlan}
enabled: true
type: vlan
proto: static
- address: ${_param:single_address}
- netmask: ${_param:control_network_netmask}
+ address: ${_param:_esc}{_param:storage_address}
+ netmask: ${_param:_esc}{_param:storage_network_netmask}
use_interfaces:
- bond0
mesh: control
bond1.2:
- name: bond1.${_param:backend_vlan}
+ name: bond1.${_param:_esc}{_param:backend_vlan}
enabled: true
type: vlan
proto: static
- address: ${_param:backend_address}
- netmask: ${_param:backend_network_netmask}
+ address: ${_param:_esc}{_param:backend_address}
+ netmask: ${_param:_esc}{_param:backend_network_netmask}
use_interfaces:
- bond1
mesh: storage_replication
\ No newline at end of file
diff --git "a/\173\043 roles \043\175/_linux_network_interface" "b/\173\043 roles \043\175/_linux_network_interface"
index dbb35eb..f14f07f 100644
--- "a/\173\043 roles \043\175/_linux_network_interface"
+++ "b/\173\043 roles \043\175/_linux_network_interface"
@@ -18,6 +18,12 @@
'tenant_network_gateway',
'external_address',
'external_network_netmask',
+ 'storage_vlan',
+ 'storage_address',
+ 'storage_network_netmask',
+ 'backend_vlan',
+ 'backend_address',
+ 'backend_network_netmask',
'dns_server01',
'dns_server02',
'mtu',