diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-05 16:44:05 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-21 15:15:31 +0000 |
| commit | 378d1f3b53053fee922accd48d37f1c678acd1fd (patch) | |
| tree | ee9012b822a3000a1aa822d7d62af9c6414769cc /mcp/patches/salt-formula-linux | |
| parent | ba754f2eb858756dd92b3f583442bbff9c991e82 (diff) | |
submodule: Bump salt-formula-maas
* bump salt-formula-maas git submodule;
* sync AArch64 initial salt config with the x86_64 default config;
* bump Pharos git submodule to sync `power_pass` MaaS configuration
paramater naming;
Change-Id: Ic59dd8becb6d83a9e67004c38d51681c88c4be7c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4c3c9c9a321d724e137f61e23509b6734ac836b7)
Diffstat (limited to 'mcp/patches/salt-formula-linux')
| -rw-r--r-- | mcp/patches/salt-formula-linux/0001-Set-ovs-bridges-as-L3-interfaces.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/patches/salt-formula-linux/0001-Set-ovs-bridges-as-L3-interfaces.patch b/mcp/patches/salt-formula-linux/0001-Set-ovs-bridges-as-L3-interfaces.patch index 390a0bfcd..50c011297 100644 --- a/mcp/patches/salt-formula-linux/0001-Set-ovs-bridges-as-L3-interfaces.patch +++ b/mcp/patches/salt-formula-linux/0001-Set-ovs-bridges-as-L3-interfaces.patch @@ -60,10 +60,10 @@ index 222ca8e..03072cd 100644 mtu {{ port.get('mtu', '1500') }} ovs_bridge {{ port.bridge }} diff --git a/linux/network/interface.sls b/linux/network/interface.sls -index c2d2a23..7efdc80 100644 +index a39fc37..b76c5d6 100644 --- a/linux/network/interface.sls +++ b/linux/network/interface.sls -@@ -91,6 +91,34 @@ add_int_{{ int_name }}_to_ovs_dpdk_bridge_{{ interface_name }}: +@@ -92,6 +92,34 @@ add_int_{{ int_name }}_to_ovs_dpdk_bridge_{{ interface_name }}: ovs_bridge_{{ interface_name }}: openvswitch_bridge.present: - name: {{ interface_name }} |