Merge "Add combined (ctl+mgm bridges for kvm) iface role"
diff --git "a/\173\043 interfaces \043\175/bond0_ab_contrail_single" "b/\173\043 interfaces \043\175/bond0_ab_contrail_single"
index fd4dfd5..8b175d6 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_contrail_single"
+++ "b/\173\043 interfaces \043\175/bond0_ab_contrail_single"
@@ -32,6 +32,7 @@
- {{ interface_name }}
{%- endfor %}
{{- set_param('keepalived_vip_interface', 'vhost0') }}
+ {{- set_param('opencontrail_compute_iface', 'bond0') }}
vhost0:
mtu: 1450
address: ${_param:_esc}{_param:tenant_address}
diff --git "a/\173\043 interfaces \043\175/bond_contrail_lacp" "b/\173\043 interfaces \043\175/bond_contrail_lacp"
new file mode 100644
index 0000000..371cbc2
--- /dev/null
+++ "b/\173\043 interfaces \043\175/bond_contrail_lacp"
@@ -0,0 +1,61 @@
+{#- Provides: #}
+{#- vhost0 , as a keepalived vip interface #}
+{#- Requirements: #}
+{#- _param:tenant_vlan #}
+{#- _param:tenant_address #}
+{#- _param:tenant_network_netmask #}
+{#- _param:tenant_network_gateway #}
+ # {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
+ {%- for interface_name, interface in interfaces.items() %}
+ {{ interface_name }}:
+ mtu: 9000
+ enabled: true
+ master: bond0
+ name: {{ interface_name }}
+ proto: manual
+ type: slave
+ ipflush_onchange: true
+ {%- endfor %}
+ bond0:
+ mtu: 9000
+ enabled: true
+ mode: '802.3ad'
+ proto: manual
+ slaves: {{ ' '.join(interfaces.keys()) }}
+ type: bond
+ use_interfaces:
+ {%- for interface_name in interfaces.keys() %}
+ - {{ interface_name }}
+ {%- endfor %}
+ require_interfaces:
+ {%- for interface_name in interfaces.keys() %}
+ - {{ interface_name }}
+ {%- endfor %}
+ {{- set_param('keepalived_vip_interface', 'vhost0') }}
+ 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:
+ - bond0.${_param:_esc}{_param:tenant_vlan}
+ require_interfaces:
+ - bond0.${_param:_esc}{_param:tenant_vlan}
+ bond0.tenant_vlan:
+ mtu: 9000
+ name: bond0.${_param:_esc}{_param:tenant_vlan}
+ enabled: true
+ proto: manual
+ type: vlan
+ use_interfaces:
+ - bond0
+ require_interfaces:
+ - bond0
diff --git "a/\173\043 interfaces \043\175/bond_ctl_contrail_lacp" "b/\173\043 interfaces \043\175/bond_ctl_contrail_lacp"
new file mode 100644
index 0000000..92d03d3
--- /dev/null
+++ "b/\173\043 interfaces \043\175/bond_ctl_contrail_lacp"
@@ -0,0 +1,53 @@
+{#- Control network with bond. For control plane nodes #}
+{#- Provides: #}
+{#- br_ctl (linux bridge) + control address #}
+{#- _param:keepalived_vip_interface = 'br_ctl' #}
+{#- Requirements: #}
+{#- _param:single_address #}
+{#- _param:control_network_netmask #}
+{#- _param:control_vlan #}
+ # {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
+ {%- for interface_name, interface in interfaces.items() %}
+ {{ interface_name }}:
+ mtu: 9000
+ enabled: true
+ master: bond1
+ name: {{ interface_name }}
+ proto: manual
+ type: slave
+ ipflush_onchange: true
+ {%- endfor %}
+ bond1:
+ enabled: true
+ mode: '802.3ad'
+ proto: manual
+ slaves: {{ ' '.join(interfaces.keys()) }}
+ type: bond
+ use_interfaces:
+ {%- for interface_name in interfaces.keys() %}
+ - {{ interface_name }}
+ {%- endfor %}
+ require_interfaces:
+ {%- for interface_name in interfaces.keys() %}
+ - {{ interface_name }}
+ {%- endfor %}
+ br_ctl:
+ address: ${_param:_esc}{_param:single_address}
+ enabled: true
+ netmask: ${_param:_esc}{_param:control_network_netmask}
+ proto: static
+ type: bridge
+ use_interfaces:
+ - bond1.${_param:_esc}{_param:control_vlan}
+ require_interfaces:
+ - bond1.${_param:_esc}{_param:control_vlan}
+ bond1.control_vlan:
+ name: bond1.${_param:_esc}{_param:control_vlan}
+ enabled: true
+ proto: manual
+ type: vlan
+ use_interfaces:
+ - bond1
+ require_interfaces:
+ - bond1
diff --git "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml" "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
index bc7f90d..af76a1c 100644
--- "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
+++ "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
@@ -8,8 +8,8 @@
{%- endif %}
parameters:
_param:
- image_host: http://cz8133.bud.mirantis.net:8099
- glance_image_cirros_location: ${_param:image_host}/cirros-0.3.5-x86_64-disk.img
+ image_host: http://172.19.112.216:8099
+ glance_image_cirros_location: ${_param:image_host}/cirros-0.4.0-x86_64-disk.img
glance_image_fedora_location: ${_param:image_host}/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
glance_image_manila_location: ${_param:image_host}/manila-service-image-master.qcow2
tempest_test_target: gtw01*
diff --git "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml" "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
index 48fa06d..9bed6da 100644
--- "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
+++ "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
@@ -8,8 +8,8 @@
{%- endif %}
parameters:
_param:
- image_host: http://cz8133.bud.mirantis.net:8099
- glance_image_cirros_location: ${_param:image_host}/cirros-0.3.5-x86_64-disk.img
+ image_host: http://172.19.112.216:8099
+ glance_image_cirros_location: ${_param:image_host}/cirros-0.4.0-x86_64-disk.img
glance_image_fedora_location: ${_param:image_host}/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
glance_image_manila_location: ${_param:image_host}/manila-service-image-master.qcow2
tempest_test_target: cfg01*
diff --git "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_offline.yml" "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_offline.yml"
index 03f3db1..1d3eeb9 100644
--- "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_offline.yml"
+++ "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_offline.yml"
@@ -9,7 +9,7 @@
parameters:
_param:
image_host: http://apt
- glance_image_cirros_location: ${_param:image_host}/cirros-0.3.5-x86_64-disk.img
+ glance_image_cirros_location: ${_param:image_host}/cirros-0.4.0-x86_64-disk.img
glance_image_fedora_location: ${_param:image_host}/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
glance_image_manila_location: ${_param:image_host}/manila-service-image-master.qcow2
tempest_test_target: cfg01*