Merge "Add kvm w/o gluster role"
diff --git "a/\173\043 interfaces \043\175/bond0_ab_contrail" "b/\173\043 interfaces \043\175/bond0_ab_contrail"
index 78be21a..a01a74c 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_contrail"
+++ "b/\173\043 interfaces \043\175/bond0_ab_contrail"
@@ -10,9 +10,10 @@
{{ interface_name }}:
mtu: 9000
enabled: true
+ master: bond0
name: {{ interface_name }}
proto: manual
- type: eth
+ type: slave
ipflush_onchange: true
{%- endfor %}
bond0:
diff --git "a/\173\043 interfaces \043\175/bond0_ab_ctl_contrail" "b/\173\043 interfaces \043\175/bond0_ab_ctl_contrail"
index 1a4370d..f15c9ba 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_ctl_contrail"
+++ "b/\173\043 interfaces \043\175/bond0_ab_ctl_contrail"
@@ -16,9 +16,10 @@
{{ interface_name }}:
mtu: 9000
enabled: true
+ master: bond0
name: {{ interface_name }}
proto: manual
- type: eth
+ type: slave
ipflush_onchange: true
{%- endfor %}
bond0:
diff --git "a/\173\043 interfaces \043\175/bond2_dpdk_prv" "b/\173\043 interfaces \043\175/bond2_dpdk_prv"
index 03dcba9..6dedee6 100644
--- "a/\173\043 interfaces \043\175/bond2_dpdk_prv"
+++ "b/\173\043 interfaces \043\175/bond2_dpdk_prv"
@@ -21,6 +21,7 @@
mode: active-backup
type: dpdk_ovs_bond
br-prv:
+ proto: static
address: ${_param:_esc}{_param:tenant_address}
enabled: true
netmask: ${_param:_esc}{_param:tenant_network_netmask}
diff --git "a/\173\043 interfaces \043\175/bond_dpdk_prv_lacp" "b/\173\043 interfaces \043\175/bond_dpdk_prv_lacp"
index 9dedfa0..6b6858d 100644
--- "a/\173\043 interfaces \043\175/bond_dpdk_prv_lacp"
+++ "b/\173\043 interfaces \043\175/bond_dpdk_prv_lacp"
@@ -23,6 +23,7 @@
mode: balance-slb
type: dpdk_ovs_bond
br-prv:
+ proto: static
address: ${_param:_esc}{_param:tenant_address}
enabled: true
netmask: ${_param:_esc}{_param:tenant_network_netmask}
diff --git "a/\173\043 interfaces \043\175/single_contrail_vlan_prv" "b/\173\043 interfaces \043\175/single_contrail_vlan_prv"
new file mode 100644
index 0000000..64f2365
--- /dev/null
+++ "b/\173\043 interfaces \043\175/single_contrail_vlan_prv"
@@ -0,0 +1,40 @@
+{#- Requirements: #}
+{#- _param:tenant_vlan #}
+{#- _param:tenant_address #}
+{#- _param:tenant_network_netmask #}
+{#- _param:tenant_network_gateway #}
+ # {{ interfaces_role }}
+ {%- set interface_name = interfaces.keys()[0] %}
+ {{ interface_name }}:
+ mtu: 9000
+ enabled: true
+ name: {{ interface_name }}
+ proto: manual
+ type: eth
+ ipflush_onchange: true
+ vhost0:
+ mtu: 9000
+ address: ${_param:_esc}{_param:tenant_address}
+ netmask: ${_param:_esc}{_param:tenant_network_netmask}
+ enabled: true
+ proto: static
+ type: eth
+ pre_up_cmds:
+ - /usr/lib/contrail/if-vhost0
+ name_servers:
+ - ${_param:_esc}{_param:dns_server01}
+ - ${_param:_esc}{_param:dns_server02}
+ use_interfaces:
+ - {{ interface_name }}.${_param:_esc}{_param:tenant_vlan}
+ require_interfaces:
+ - {{ interface_name }}.${_param:_esc}{_param:tenant_vlan}
+ {{ interface_name }}.tenant_vlan:
+ mtu: 9000
+ name: {{ interface_name }}.${_param:_esc}{_param:tenant_vlan}
+ enabled: true
+ proto: manual
+ type: vlan
+ use_interfaces:
+ - {{ interface_name }}
+ require_interfaces:
+ - {{ interface_name }}
diff --git "a/\173\043 interfaces \043\175/single_ovs_dpdk_prv" "b/\173\043 interfaces \043\175/single_ovs_dpdk_prv"
index cf006ca..f676503 100644
--- "a/\173\043 interfaces \043\175/single_ovs_dpdk_prv"
+++ "b/\173\043 interfaces \043\175/single_ovs_dpdk_prv"
@@ -16,6 +16,7 @@
bridge: br-prv
{% endfor %}
br-prv:
+ proto: static
address: ${_param:_esc}{_param:tenant_address}
netmask: ${_param:_esc}{_param:tenant_network_netmask}
enabled: true
diff --git "a/\173\043 roles \043\175/kubernetes_proxy" "b/\173\043 roles \043\175/kubernetes_proxy"
new file mode 100644
index 0000000..950ef3f
--- /dev/null
+++ "b/\173\043 roles \043\175/kubernetes_proxy"
@@ -0,0 +1,12 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - cluster.${_param:cluster_name}.kubernetes.proxy
+{{- set_param('keepalived_vip_interface', 'br_ctl') }}
+{{- register_metaparam('keepalived_vip_priority', 'kubernetes_proxy') }}
+{{- register_metaparam('keepalived_vip_virtual_router_id', 'kubernetes_proxy') }}
\ No newline at end of file