Ironic
Change-Id: I59db6a69986a93d78a76e226ca4ec4bfb42e5a38
diff --git "a/\173\043 interfaces \043\175/bond_baremetal_lacp" "b/\173\043 interfaces \043\175/bond_baremetal_lacp"
new file mode 100644
index 0000000..c60a4a5
--- /dev/null
+++ "b/\173\043 interfaces \043\175/bond_baremetal_lacp"
@@ -0,0 +1,46 @@
+
+{#- pxe network with bond. For control plane bmt nodes #}
+{#- Provides: #}
+ # {{ 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_baremetal:
+ enabled: true
+ proto: manual
+ type: bridge
+ use_interfaces:
+ - bond1.2402
+ require_interfaces:
+ - bond1.2402
+ bond1.2402:
+ name: bond1.2402
+ enabled: true
+ proto: manual
+ type: vlan
+ use_interfaces:
+ - bond1
+ require_interfaces:
+ - bond1
\ No newline at end of file
diff --git "a/\173\043 interfaces \043\175/bond_ctl_baremetal_lacp" "b/\173\043 interfaces \043\175/bond_ctl_baremetal_lacp"
new file mode 100644
index 0000000..cc8dd5d
--- /dev/null
+++ "b/\173\043 interfaces \043\175/bond_ctl_baremetal_lacp"
@@ -0,0 +1,64 @@
+{#- 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: bond0
+ name: {{ interface_name }}
+ proto: manual
+ type: slave
+ ipflush_onchange: true
+ {%- endfor %}
+ bond0:
+ 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:
+ - bond0.${_param:_esc}{_param:control_vlan}
+ require_interfaces:
+ - bond0.${_param:_esc}{_param:control_vlan}
+ bond0.control_vlan:
+ name: bond0.${_param:_esc}{_param:control_vlan}
+ enabled: true
+ proto: manual
+ type: vlan
+ use_interfaces:
+ - bond0
+ require_interfaces:
+ - bond0
+ bond0.2402:
+ name: bond0.2402
+ enabled: true
+ ovs_bridge: br-baremetal
+ ovs_type: OVSPort
+ proto: manual
+ type: vlan
+ use_interfaces:
+ - bond0
+ require_interfaces:
+ - bond0
\ No newline at end of file
diff --git "a/\173\043 interfaces \043\175/bond_ctl_lacp" "b/\173\043 interfaces \043\175/bond_ctl_lacp"
index 9c8129e..66685f3 100644
--- "a/\173\043 interfaces \043\175/bond_ctl_lacp"
+++ "b/\173\043 interfaces \043\175/bond_ctl_lacp"
@@ -50,4 +50,4 @@
use_interfaces:
- bond0
require_interfaces:
- - bond0
+ - bond0
\ No newline at end of file
diff --git "a/\173\043 interfaces \043\175/single_baremetal" "b/\173\043 interfaces \043\175/single_baremetal"
index 240f067..7027ef5 100644
--- "a/\173\043 interfaces \043\175/single_baremetal"
+++ "b/\173\043 interfaces \043\175/single_baremetal"
@@ -1,15 +1,24 @@
-{#- External network. For proxy and other nodes with endpoints from external network #}
+{#- pxe network. #}
{#- Provides: #}
-{#- (linux interface) + address #}
+{#- br_baremetal (linux bridge) + address #}
{#- Requires: #}
-{#- _param:external_address #}
-{#- _param:external_network_netmask #}
+{#- _param:baremetal_address #}
+{#- _param:openstack_baremetal_neutron_subnet_cidr #}
# {{ interfaces_role }}
{%- set interface_name = interfaces.keys()[0] %}
{{ interface_name }}:
enabled: true
name: {{ interface_name }}
+ proto: manual
+ type: eth
+ ipflush_onchange: true
+ br_baremetal:
address: ${_param:_esc}{_param:baremetal_address}
+ enabled: true
netmask: 255.255.255.0
proto: static
- type: eth
+ type: bridge
+ use_interfaces:
+ - {{ interface_name }}
+ require_interfaces:
+ - {{ interface_name }}
diff --git "a/\173\043 roles \043\175/openstack_baremetal" "b/\173\043 roles \043\175/openstack_baremetal"
index f6739e4..2478a2f 100644
--- "a/\173\043 roles \043\175/openstack_baremetal"
+++ "b/\173\043 roles \043\175/openstack_baremetal"
@@ -7,6 +7,6 @@
classes:
#}
- cluster.${_param:cluster_name}.openstack.baremetal
-{{- set_param('keepalived_vip_interface', 'br_ctl') }}
+{{- set_param('keepalived_vip_interface', 'br_baremetal') }}
{{- register_metaparam('keepalived_vip_priority', 'openstack_baremetal') }}
{{- register_metaparam('keepalived_vip_virtual_router_id', 'openstack_baremetal') }}
\ No newline at end of file
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 3d01181..d118f2f 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"
@@ -9,7 +9,6 @@
{%- if default_context.get('opencontrail_enabled', 'False') == 'True' %}
- system.neutron.client.service.contrail_public_v2
{%- endif %}
-- service.runtest.tempest.tempest_net
parameters:
_param:
image_host: http://172.19.112.216:8099