738010
From 2ea5ccd14def513ced62a03a4b2ac14f58f28d32 Mon Sep 17 00:00:00 2001
c60dcd
From: Lars Kellogg-Stedman <lars@redhat.com>
c60dcd
Date: Thu, 15 Jun 2017 12:20:39 -0400
c60dcd
Subject: azure: ensure that networkmanager hook script runs
c60dcd
c60dcd
The networkmanager hook script was failing to run due to the changes
c60dcd
we made to resolve rhbz#1440831.  This corrects the regression by
c60dcd
allowing the NM hook script to run regardless of whether or not
c60dcd
cloud-init is "enabled".
c60dcd
c60dcd
Resolves: rhbz#1460206
c60dcd
X-downstream-only: true
c60dcd
---
c60dcd
 tools/hook-dhclient        | 3 +--
c60dcd
 tools/hook-network-manager | 3 +--
c60dcd
 tools/hook-rhel.sh         | 3 +--
c60dcd
 3 files changed, 3 insertions(+), 6 deletions(-)
c60dcd
c60dcd
diff --git a/tools/hook-dhclient b/tools/hook-dhclient
c60dcd
index 02122f3..181cd51 100755
c60dcd
--- a/tools/hook-dhclient
c60dcd
+++ b/tools/hook-dhclient
c60dcd
@@ -13,8 +13,7 @@ is_azure() {
c60dcd
 }
c60dcd
 
c60dcd
 is_enabled() {
c60dcd
-    # only execute hooks if cloud-init is enabled and on azure
c60dcd
-    [ -e /run/cloud-init/enabled ] || return 1
c60dcd
+    # only execute hooks if cloud-init is running on azure
c60dcd
     is_azure
c60dcd
 }
c60dcd
 
c60dcd
diff --git a/tools/hook-network-manager b/tools/hook-network-manager
c60dcd
index 67d9044..1d52cad 100755
c60dcd
--- a/tools/hook-network-manager
c60dcd
+++ b/tools/hook-network-manager
c60dcd
@@ -13,8 +13,7 @@ is_azure() {
c60dcd
 }
c60dcd
 
c60dcd
 is_enabled() {
c60dcd
-    # only execute hooks if cloud-init is enabled and on azure
c60dcd
-    [ -e /run/cloud-init/enabled ] || return 1
c60dcd
+    # only execute hooks if cloud-init running on azure
c60dcd
     is_azure
c60dcd
 }
c60dcd
 
c60dcd
diff --git a/tools/hook-rhel.sh b/tools/hook-rhel.sh
c60dcd
index 513a551..d75767e 100755
c60dcd
--- a/tools/hook-rhel.sh
c60dcd
+++ b/tools/hook-rhel.sh
c60dcd
@@ -13,8 +13,7 @@ is_azure() {
c60dcd
 }
c60dcd
 
c60dcd
 is_enabled() {
c60dcd
-    # only execute hooks if cloud-init is enabled and on azure
c60dcd
-    [ -e /run/cloud-init/enabled ] || return 1
c60dcd
+    # only execute hooks if cloud-init is running on azure
c60dcd
     is_azure
c60dcd
 }
c60dcd
 
c60dcd
-- 
c60dcd
1.8.3.1
c60dcd