|
 |
6e9e77 |
From c5a88b2c987bda11b102de9ef1fca08191672a36 Mon Sep 17 00:00:00 2001
|
|
|
6e9e77 |
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
6e9e77 |
Date: Tue, 17 Apr 2018 13:07:53 +0200
|
|
|
6e9e77 |
Subject: [PATCH 1/3] Revert "azure: Fix publishing of hostname"
|
|
|
6e9e77 |
|
|
|
6e9e77 |
RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
6e9e77 |
Message-id: <20180417130754.12918-2-vkuznets@redhat.com>
|
|
|
6e9e77 |
Patchwork-id: 79658
|
|
|
6e9e77 |
O-Subject: [RHEL7.6/7.5.z cloud-init PATCH 1/2] Revert "azure: Fix publishing of hostname"
|
|
|
6e9e77 |
Bugzilla: 1568717
|
|
|
6e9e77 |
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
|
|
6e9e77 |
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
|
6e9e77 |
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
|
6e9e77 |
|
|
|
6e9e77 |
Turns out the downstream-only fix doesn't work, revert it.
|
|
|
6e9e77 |
|
|
|
6e9e77 |
This reverts commit 7a2f4618ba79ff3f7c4c7d026e645647a3da25d3.
|
|
|
6e9e77 |
|
|
|
6e9e77 |
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
6e9e77 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
6e9e77 |
---
|
|
|
6e9e77 |
cloudinit/sources/DataSourceAzure.py | 3 +--
|
|
|
6e9e77 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
6e9e77 |
|
|
|
6e9e77 |
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
|
|
|
6e9e77 |
index a0ebd2b..48a3e1d 100644
|
|
|
6e9e77 |
--- a/cloudinit/sources/DataSourceAzure.py
|
|
|
6e9e77 |
+++ b/cloudinit/sources/DataSourceAzure.py
|
|
|
6e9e77 |
@@ -27,8 +27,7 @@ AGENT_START = ['service', 'walinuxagent', 'start']
|
|
|
6e9e77 |
AGENT_START_BUILTIN = "__builtin__"
|
|
|
6e9e77 |
BOUNCE_COMMAND = [
|
|
|
6e9e77 |
'sh', '-xc',
|
|
|
6e9e77 |
- "i=$interface; DHCP_HOSTNAME=$hostname; x=0; "
|
|
|
6e9e77 |
- "ifdown $i || x=$?; ifup $i || x=$?; exit $x"
|
|
|
6e9e77 |
+ "i=$interface; x=0; ifdown $i || x=$?; ifup $i || x=$?; exit $x"
|
|
|
6e9e77 |
]
|
|
|
6e9e77 |
# azure systems will always have a resource disk, and 66-azure-ephemeral.rules
|
|
|
6e9e77 |
# ensures that it gets linked to this path.
|
|
|
6e9e77 |
--
|
|
|
6e9e77 |
1.8.3.1
|
|
|
6e9e77 |
|