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