|
 |
06517b |
From 51dcc3b2ba972db7b30c75097919b3e4ab396a89 Mon Sep 17 00:00:00 2001
|
|
|
866c13 |
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
866c13 |
Date: Tue, 28 Apr 2020 10:00:11 +0200
|
|
|
866c13 |
Subject: [PATCH] Update 'Provisioning' options (#1853)
|
|
|
866c13 |
MIME-Version: 1.0
|
|
|
866c13 |
Content-Type: text/plain; charset=UTF-8
|
|
|
866c13 |
Content-Transfer-Encoding: 8bit
|
|
|
866c13 |
|
|
|
866c13 |
RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
866c13 |
Message-id: <20200427083047.1269733-1-vkuznets@redhat.com>
|
|
|
866c13 |
Patchwork-id: 96138
|
|
|
866c13 |
O-Subject: [RHEL-8.2.1 WALinuxAgent PATCH] Update 'Provisioning' options (#1853)
|
|
|
06517b |
Bugzilla: 1822882
|
|
|
866c13 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
866c13 |
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
|
866c13 |
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
|
866c13 |
|
|
|
866c13 |
commit 92b652e031dd01027113702df7ee93c816bfd1aa
|
|
|
866c13 |
Author: Vitaly Kuznetsov <vitty@redhat.com>
|
|
|
866c13 |
Date: Tue Apr 21 02:01:03 2020 +0200
|
|
|
866c13 |
|
|
|
866c13 |
Update 'Provisioning' options (#1853)
|
|
|
866c13 |
|
|
|
866c13 |
'Provisioning.Enabled' and 'Provisioning.UseCloudInit' parameters are
|
|
|
866c13 |
removed since v2.2.45 and replaced with 'Provisioning.Agent'. Update
|
|
|
866c13 |
distro specific configs accordingly.
|
|
|
866c13 |
|
|
|
866c13 |
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
866c13 |
|
|
|
866c13 |
Co-authored-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
866c13 |
|
|
|
866c13 |
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
866c13 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
866c13 |
---
|
|
|
866c13 |
config/alpine/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/arch/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/bigip/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/clearlinux/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/coreos/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/debian/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/freebsd/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/gaia/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/iosxe/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/nsbsd/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/openbsd/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/suse/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/ubuntu/waagent.conf | 8 +++-----
|
|
|
866c13 |
config/waagent.conf | 8 +++-----
|
|
|
866c13 |
14 files changed, 42 insertions(+), 70 deletions(-)
|
|
|
866c13 |
|
|
|
866c13 |
diff --git a/config/alpine/waagent.conf b/config/alpine/waagent.conf
|
|
|
866c13 |
index ac9466e..2a010cf 100644
|
|
|
866c13 |
--- a/config/alpine/waagent.conf
|
|
|
866c13 |
+++ b/config/alpine/waagent.conf
|
|
|
866c13 |
@@ -2,15 +2,13 @@
|
|
|
866c13 |
# Windows Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/arch/waagent.conf b/config/arch/waagent.conf
|
|
|
866c13 |
index 8d509cf..f999359 100644
|
|
|
866c13 |
--- a/config/arch/waagent.conf
|
|
|
866c13 |
+++ b/config/arch/waagent.conf
|
|
|
866c13 |
@@ -2,11 +2,9 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=n
|
|
|
866c13 |
diff --git a/config/bigip/waagent.conf b/config/bigip/waagent.conf
|
|
|
866c13 |
index 7446bcb..49acf9d 100644
|
|
|
866c13 |
--- a/config/bigip/waagent.conf
|
|
|
866c13 |
+++ b/config/bigip/waagent.conf
|
|
|
866c13 |
@@ -13,15 +13,13 @@ Role.ConfigurationConsumer=None
|
|
|
866c13 |
# Specified program is invoked with XML file argument specifying role topology.
|
|
|
866c13 |
Role.TopologyConsumer=None
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/clearlinux/waagent.conf b/config/clearlinux/waagent.conf
|
|
|
866c13 |
index 10567cc..0b70d26 100644
|
|
|
866c13 |
--- a/config/clearlinux/waagent.conf
|
|
|
866c13 |
+++ b/config/clearlinux/waagent.conf
|
|
|
866c13 |
@@ -13,11 +13,9 @@ Role.ConfigurationConsumer=None
|
|
|
866c13 |
# Specified program is invoked with XML file argument specifying role topology.
|
|
|
866c13 |
Role.TopologyConsumer=None
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf
|
|
|
866c13 |
index 8d3312c..0ce7b27 100644
|
|
|
866c13 |
--- a/config/coreos/waagent.conf
|
|
|
866c13 |
+++ b/config/coreos/waagent.conf
|
|
|
866c13 |
@@ -2,15 +2,13 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=n
|
|
|
866c13 |
diff --git a/config/debian/waagent.conf b/config/debian/waagent.conf
|
|
|
866c13 |
index 28e496e..4c1880e 100644
|
|
|
866c13 |
--- a/config/debian/waagent.conf
|
|
|
866c13 |
+++ b/config/debian/waagent.conf
|
|
|
866c13 |
@@ -2,15 +2,13 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf
|
|
|
866c13 |
index 83988ae..1d1710b 100644
|
|
|
866c13 |
--- a/config/freebsd/waagent.conf
|
|
|
866c13 |
+++ b/config/freebsd/waagent.conf
|
|
|
866c13 |
@@ -2,15 +2,13 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/gaia/waagent.conf b/config/gaia/waagent.conf
|
|
|
866c13 |
index 6992ff2..b1dc764 100644
|
|
|
866c13 |
--- a/config/gaia/waagent.conf
|
|
|
866c13 |
+++ b/config/gaia/waagent.conf
|
|
|
866c13 |
@@ -2,15 +2,13 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=n
|
|
|
866c13 |
diff --git a/config/iosxe/waagent.conf b/config/iosxe/waagent.conf
|
|
|
866c13 |
index 6787d30..533a234 100644
|
|
|
866c13 |
--- a/config/iosxe/waagent.conf
|
|
|
866c13 |
+++ b/config/iosxe/waagent.conf
|
|
|
866c13 |
@@ -2,11 +2,9 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=n
|
|
|
866c13 |
-
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/nsbsd/waagent.conf b/config/nsbsd/waagent.conf
|
|
|
866c13 |
index 178f9a2..b859fd5 100644
|
|
|
866c13 |
--- a/config/nsbsd/waagent.conf
|
|
|
866c13 |
+++ b/config/nsbsd/waagent.conf
|
|
|
866c13 |
@@ -2,11 +2,9 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=n
|
|
|
866c13 |
diff --git a/config/openbsd/waagent.conf b/config/openbsd/waagent.conf
|
|
|
866c13 |
index 54f2e11..697f129 100644
|
|
|
866c13 |
--- a/config/openbsd/waagent.conf
|
|
|
866c13 |
+++ b/config/openbsd/waagent.conf
|
|
|
866c13 |
@@ -2,11 +2,9 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf
|
|
|
866c13 |
index 5e601e6..dc99b12 100644
|
|
|
866c13 |
--- a/config/suse/waagent.conf
|
|
|
866c13 |
+++ b/config/suse/waagent.conf
|
|
|
866c13 |
@@ -2,15 +2,13 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
|
|
|
866c13 |
index 759db70..8c2c512 100644
|
|
|
866c13 |
--- a/config/ubuntu/waagent.conf
|
|
|
866c13 |
+++ b/config/ubuntu/waagent.conf
|
|
|
866c13 |
@@ -2,15 +2,13 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=n
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=y
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
diff --git a/config/waagent.conf b/config/waagent.conf
|
|
|
866c13 |
index 62a9441..b558bb4 100644
|
|
|
866c13 |
--- a/config/waagent.conf
|
|
|
866c13 |
+++ b/config/waagent.conf
|
|
|
866c13 |
@@ -2,15 +2,13 @@
|
|
|
866c13 |
# Microsoft Azure Linux Agent Configuration
|
|
|
866c13 |
#
|
|
|
866c13 |
|
|
|
866c13 |
-# Enable instance creation
|
|
|
866c13 |
-Provisioning.Enabled=y
|
|
|
866c13 |
-
|
|
|
866c13 |
# Enable extension handling. Do not disable this unless you do not need password reset,
|
|
|
866c13 |
# backup, monitoring, or any extension handling whatsoever.
|
|
|
866c13 |
Extensions.Enabled=y
|
|
|
866c13 |
|
|
|
866c13 |
-# Rely on cloud-init to provision
|
|
|
866c13 |
-Provisioning.UseCloudInit=n
|
|
|
866c13 |
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
|
|
|
866c13 |
+# "cloud-init", or "disabled".
|
|
|
866c13 |
+Provisioning.Agent=auto
|
|
|
866c13 |
|
|
|
866c13 |
# Password authentication for root account will be unavailable.
|
|
|
866c13 |
Provisioning.DeleteRootPassword=y
|
|
|
866c13 |
--
|
|
|
866c13 |
1.8.3.1
|
|
|
866c13 |
|