Merge "override cirros image name"
diff --git "a/\173\043 interfaces \043\175/combined_vlan_ctl_mgm_kvm" "b/\173\043 interfaces \043\175/combined_vlan_ctl_mgm_kvm"
new file mode 100644
index 0000000..213b2ff
--- /dev/null
+++ "b/\173\043 interfaces \043\175/combined_vlan_ctl_mgm_kvm"
@@ -0,0 +1,47 @@
+{#- Control network with mgm. For compute nodes using 1 interface for mgm and ctl+vlan #}
+{#- Provides: #}
+{#- Requirements: #}
+{#- _param:single_address #}
+{#- _param:deploy_address #}
+{#- _param:deploy_network_netmask #}
+{#- _param:deploy_network_gateway #}
+{#- _param:control_network_netmask #}
+{#- _param:control_vlan #}
+
+ # {{ interfaces_role }}
+ {%- set interface_name = interfaces.keys()[0] %}
+ {{ interface_name }}:
+ mtu: 1500
+ enabled: true
+ name: {{ interface_name }}
+ type: eth
+ ipflush_onchange: true
+ restart_on_ipflush: true
+ proto: manual
+ br_mgm:
+ enabled: true
+ proto: dhcp
+ type: bridge
+ ipflush_onchange: true
+ restart_on_ipflush: true
+ use_interfaces:
+ - {{ interface_name }}
+ {{ interface_name }}.control_vlan:
+ mtu: 1500
+ name: {{ interface_name }}.${_param:_esc}{_param:control_vlan}
+ enabled: true
+ proto: manual
+ type: vlan
+ br_ctl:
+ enabled: true
+ address: ${_param:_esc}{_param:single_address}
+ netmask: ${_param:_esc}{_param:control_network_netmask}
+ proto: static
+ type: bridge
+ name_servers:
+ - ${_param:_esc}{_param:dns_server01}
+ - ${_param:_esc}{_param:dns_server02}
+ use_interfaces:
+ - {{ interface_name }}.${_param:_esc}{_param:control_vlan}
+ require_interfaces:
+ - {{ interface_name }}.${_param:_esc}{_param:control_vlan}
\ No newline at end of file
diff --git "a/\173\043 interfaces \043\175/heat_single_ovs_floating" "b/\173\043 interfaces \043\175/heat_single_ovs_floating"
new file mode 100644
index 0000000..2e66c68
--- /dev/null
+++ "b/\173\043 interfaces \043\175/heat_single_ovs_floating"
@@ -0,0 +1,25 @@
+{#- Floating on a separated bond interfaces. For gateway nodes and computes with dvr #}
+{#- Provides: #}
+{#- br_floating (OVS bridge) #}
+{#- Requirements: #}
+{#- _param:?addr #}
+{#- _param:?mask #}
+{#- _param:?vlan #}
+ # {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
+ {%- for interface_name, interface in interfaces.items() %}
+ {{ interface_name }}:
+ mtu: 9000
+ enabled: true
+ name: {{ interface_name }}
+ proto: manual
+ ovs_port_type: OVSPort
+ ovs_bridge: br-floating
+ type: ovs_port
+ bridge: br-floating
+ ipflush_onchange: true
+ restart_on_ipflush: true
+ {%- endfor %}
+ br-floating:
+ enabled: true
+ type: ovs_bridge
diff --git "a/\173\043 interfaces \043\175/heat_single_tenant" "b/\173\043 interfaces \043\175/heat_single_tenant"
new file mode 100644
index 0000000..fe8514f
--- /dev/null
+++ "b/\173\043 interfaces \043\175/heat_single_tenant"
@@ -0,0 +1,29 @@
+{#- Tenant over VXLAN. For gateway nodes. Used for virtual deploys. #}
+{#- Because we don't use tagging of switch ports, we shouldn't use tag on br-mesh#}
+{#- Provides: #}
+{#- br_mesh (OVS bridge) + tenant address #}
+{#- Requirements: #}
+{#- _param:tenant_address #}
+{#- _param:tenant_netmask #}
+{#- _param:tenant_vlan #}
+ # {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
+ {%- for interface_name, interface in interfaces.items() %}
+ {{ interface_name }}:
+ mtu: 9000
+ enabled: true
+ name: {{ interface_name }}
+ proto: manual
+ type: eth
+ ipflush_onchange: true
+ br-mesh:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:_esc}{_param:tenant_address}
+ netmask: ${_param:_esc}{_param:tenant_network_netmask}
+ use_interfaces:
+ - {{ interface_name }}
+ require_interfaces:
+ - {{ interface_name }}
+ {%- endfor %}