puppet: fix for the branch change

The branch stable/pike is gone from upstream for these
puppet packages, and they don't need to be upgraded in
stx 5.0, so just add "nobranch=1" to bypass the branch
check, no actual source code update for these recipes.

Issue-ID: INF-215

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

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bb
index a201e0a..acb935b 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bb
@@ -11,10 +11,9 @@ RDEPENDS_${PN} += " \
 PV = "11.3.0"
 SRCREV = "8241a1d13be6c3ee6344fa46dcfc045439044e76"
 PROTOCOL = "https"
-BRANCH = "stable/pike"
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/openstack/puppet-barbican.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+SRC_URI = "git://github.com/openstack/puppet-barbican.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
        file://puppet-barbican/Add-gemspec.patch \
        "
 

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bb
index 7d9c061..24dd51b 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bb
@@ -13,10 +13,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
 PV = "11.5.0"
 SRCREV = "d75706e38fdf63f9c3174a526a7d07799390dfeb"
 PROTOCOL = "https"
-BRANCH = "stable/pike"
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/openstack/puppet-horizon.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+SRC_URI = "git://github.com/openstack/puppet-horizon.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
        file://${PN}/Add-gemspec.patch \
        "
 

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bb
index 81a6fa6..eda84e5 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
 PV = "11.3.0"
 SRCREV = "305c91cac00f720ad6461b442e71b52b12f9ae57"
 PROTOCOL = "https"
-BRANCH = "stable/pike"
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/openstack/puppet-keystone.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+SRC_URI = "git://github.com/openstack/puppet-keystone.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
        file://puppet-keystone/Add-gemspec.patch \
        "
 

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bb
index 4909402..5057719 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
 PV = "11.3.0"
 SRCREV = "79a799f5d78667b5eee81e71782e8591f2e62ecc"
 PROTOCOL = "https"
-BRANCH = "stable/pike"
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/openstack/puppet-openstacklib.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+SRC_URI = "git://github.com/openstack/puppet-openstacklib.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
        file://puppet-openstacklib/Add-gemspec.patch \
        "
 

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bb b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bb
index 27b9a70..88720af 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bb
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86e96afa80a52eedda5dccc1af36b4f2"
 PV = "11.3.0"
 SRCREV = "5ad200e9d8af200a8f50f86a2db4cf3f36ab2a4c"
 PROTOCOL = "https"
-BRANCH = "stable/pike"
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/openstack/puppet-oslo.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+SRC_URI = "git://github.com/openstack/puppet-oslo.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
        file://puppet-oslo/Add-gemspec.patch \
        "