puppet: change branch to 'main' for some recipes

The default branch in github for the following recipes
is changed from 'master' to 'main':
- puppetlabs-apache
- puppetlabs-concat
- puppetlabs-firewall
- puppetlabs-haproxy
- puppetlabs-inifile
- puppetlabs-mysql
- puppetlabs-postgresql
- puppetlabs-stdlib

Issue-ID: INF-215

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I1fe4754be32b7ef40d73b99e605b943d6a7499d2

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-apache_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-apache_git.bb
index f8b3132..beb5062 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-apache_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-apache_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PV = "1.10.0"
 SRCREV = "410309f5facd0df7d836ea66c27ca9514031b6e3"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/puppetlabs/puppetlabs-apache.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-concat_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-concat_git.bb
index 3e0ad77..858f4ca 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-concat_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-concat_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PV = "2.2.0"
 SRCREV = "fdf4a84534ccb1b9ae8ffb654c7e160a31e294ee"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/puppetlabs/puppetlabs-concat.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-firewall_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-firewall_git.bb
index cea6628..74855d1 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-firewall_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-firewall_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PV = "1.8.2"
 SRCREV = "23016934d23c5c2f3f3edbc2ec8279f8faac2457"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/puppetlabs/puppetlabs-firewall;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-haproxy_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-haproxy_git.bb
index 632fc9c..7c973df 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-haproxy_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-haproxy_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PV = "1.5.0"
 SRCREV = "3ac513c0ceb3bcfe35dd2936875189ccfc991a34"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/puppetlabs/puppetlabs-haproxy;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-inifile.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-inifile.bb
index 503835c..763a5ef 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-inifile.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-inifile.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PV = "1.6.0"
 SRCREV = "88bf9868b532ddf556bdb617f67eda9de0b8dc0f"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/puppetlabs/puppetlabs-inifile;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-mysql_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-mysql_git.bb
index 35d7d1e..78d848f 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-mysql_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-mysql_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PV = "3.11.0"
 SRCREV = "920dd76214d87d9b26f0db105886ee89ac266c4e"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/puppetlabs/puppetlabs-mysql.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-postgresql_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-postgresql_git.bb
index d8f3527..ddb64de 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-postgresql_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-postgresql_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PV = "4.8.0"
 SRCREV = "d022a56b28b2174456fc0f6adc51a4b54493afad"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 S = "${WORKDIR}/git"
 
 SRC_URI = " \

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-stdlib_git.bbappend b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-stdlib_git.bbappend
index 302b02d..a93d7eb 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-stdlib_git.bbappend
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-stdlib_git.bbappend
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "b89d5f388ca701e38a0e0337408f5ccb7e68565f"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 PV = "4.18.0"
 
 inherit stx-metadata