Merge "Add 'single_external' interface 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/bond0_ab_nondvr_vxlan_ctl_mesh_raw" "b/\173\043 interfaces \043\175/bond0_ab_nondvr_vxlan_ctl_mesh_raw"
index f4abbf2..8bec6dd 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_nondvr_vxlan_ctl_mesh_raw"
+++ "b/\173\043 interfaces \043\175/bond0_ab_nondvr_vxlan_ctl_mesh_raw"
@@ -14,9 +14,10 @@
{{ interface_name }}:
mtu: 9000
enabled: true
+ master: bond0
name: {{ interface_name }}
proto: manual
- type: eth
+ type: slave
ipflush_onchange: true
{%- endfor %}
bond0:
@@ -73,4 +74,4 @@
use_interfaces:
- br_mesh
require_interfaces:
- - br_mesh
\ No newline at end of file
+ - br_mesh
diff --git "a/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl" "b/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl"
index c136ab9..8fef103 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl"
+++ "b/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl"
@@ -11,9 +11,10 @@
{{ interface_name }}:
mtu: 9000
enabled: true
+ master: bond0
name: {{ interface_name }}
proto: manual
- type: eth
+ type: slave
ipflush_onchange: true
{%- endfor %}
bond0:
@@ -49,4 +50,4 @@
use_interfaces:
- bond0
require_interfaces:
- - bond0
\ No newline at end of file
+ - bond0
diff --git "a/\173\043 roles \043\175/infra_kvm_wo_gluster" "b/\173\043 roles \043\175/infra_kvm_wo_gluster"
new file mode 100644
index 0000000..d0f8666
--- /dev/null
+++ "b/\173\043 roles \043\175/infra_kvm_wo_gluster"
@@ -0,0 +1,12 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - cluster.${_param:cluster_name}.infra.kvm
+{{- set_param('keepalived_vip_interface', 'br_ctl') }}
+{{- register_metaparam('keepalived_vip_priority', 'infra_kvm') }}
+{{- register_metaparam('keepalived_vip_virtual_router_id', 'infra_kvm') }}
\ No newline at end of file
diff --git "a/\173\043 roles \043\175/openstack_barbican" "b/\173\043 roles \043\175/openstack_barbican"
new file mode 100644
index 0000000..2e98488
--- /dev/null
+++ "b/\173\043 roles \043\175/openstack_barbican"
@@ -0,0 +1,12 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - cluster.${_param:cluster_name}.openstack.barbican
+{{- set_param('keepalived_vip_interface', 'br_ctl') }}
+{{- register_metaparam('keepalived_vip_priority', 'openstack_barbican') }}
+{{- register_metaparam('keepalived_vip_virtual_router_id', 'openstack_barbican') }}
\ No newline at end of file