From 812d2f0ef3b7f638a29f10770007ef249d609c2c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 23 Nov 2017 19:16:30 +0100 Subject: u/fuel: Bump & rebase for MaaS fabrics fix Change-Id: I58bacd2b8f9d210fd9e144cd8db6239ca0b8949d Signed-off-by: Alexandru Avadanii --- .../0014-baremetal-linux-image-generic-hwe-16.04-edge.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch') diff --git a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch index 35e7b8be..9ba9a67a 100644 --- a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch +++ b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch @@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 8fc03d4..b79cc85 100755 +index 4b3ec42..ad8218e 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -24,9 +24,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ +@@ -39,9 +39,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ salt -C 'kvm*' pkg.install bridge-utils salt -C '*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network @@ -49,7 +49,7 @@ index 8fc03d4..b79cc85 100755 salt -C 'kvm* or cmp*' system.reboot wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ "tee /dev/stderr | grep -Fq 'Not connected'" -@@ -70,3 +73,10 @@ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_US +@@ -85,3 +88,10 @@ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_US # Disable proxy dhcp routes after installation salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ args='unset new_routers' -- cgit 1.2.3-korg