* [m-c-s][PATCH 1/5] Fix the puppet run failure issue
@ 2015-08-20 2:56 Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 2/5] Add the puppet.conf for the puppet agent Mark Asselstine
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Mark Asselstine @ 2015-08-20 2:56 UTC (permalink / raw)
To: bruce.ashfield; +Cc: meta-virtualization
From: Guojian Zhou <guojian.zhou@windriver.com>
The puppet's execution depends on the facter, so add the required
RDEPENDS in the bb file.
The puppet tool run failure information:
==============================================
root@# puppet help
/usr/lib64/ruby/rubygems/custom_require.rb:36:in `require': cannot load such file -- facter (LoadError)
from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
from /usr/lib64/ruby/gems/1.9.1/gems/puppet-3.7.3/lib/puppet.rb:6:in `<top (required)>'
from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
from /usr/lib64/ruby/gems/1.9.1/gems/puppet-3.7.3/lib/puppet/util/command_line.rb:12:in `<top (required)>'
from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
from /usr/lib64/ruby/gems/1.9.1/gems/puppet-3.7.3/bin/puppet:7:in `<top (required)>'
from /usr/bin/puppet:23:in `load'
from /usr/bin/puppet:23:in `<main>'
Signed-off-by: Guojian Zhou <guojian.zhou@windriver.com>
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
meta-openstack/recipes-support/puppet/puppet_3.7.3.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
index afd9a23..22376cf 100644
--- a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
+++ b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
@@ -18,6 +18,12 @@ DEPENDS += " \
hiera \
"
+RDEPENDS_${PN} += " \
+ ruby \
+ facter \
+ hiera \
+"
+
RUBY_INSTALL_GEMS = "puppet-${PV}.gem"
do_install_append() {
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [m-c-s][PATCH 2/5] Add the puppet.conf for the puppet agent
2015-08-20 2:56 [m-c-s][PATCH 1/5] Fix the puppet run failure issue Mark Asselstine
@ 2015-08-20 2:56 ` Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 3/5] Add the ruby-shadow recipe for the puppet tool Mark Asselstine
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Mark Asselstine @ 2015-08-20 2:56 UTC (permalink / raw)
To: bruce.ashfield; +Cc: meta-virtualization
From: Guojian Zhou <guojian.zhou@windriver.com>
The puppet agent requires the /etc/puppet/puppet.conf.
Signed-off-by: Guojian Zhou <guojian.zhou@windriver.com>
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
meta-openstack/recipes-support/puppet/puppet/puppet.conf | 9 +++++++++
meta-openstack/recipes-support/puppet/puppet_3.7.3.bb | 2 ++
2 files changed, 11 insertions(+)
create mode 100644 meta-openstack/recipes-support/puppet/puppet/puppet.conf
diff --git a/meta-openstack/recipes-support/puppet/puppet/puppet.conf b/meta-openstack/recipes-support/puppet/puppet/puppet.conf
new file mode 100644
index 0000000..efe143c
--- /dev/null
+++ b/meta-openstack/recipes-support/puppet/puppet/puppet.conf
@@ -0,0 +1,9 @@
+[main]
+logdir=/var/log/puppet
+vardir=/var/lib/puppet
+ssldir=/var/lib/puppet/ssl
+rundir=/var/run/puppet
+factpath=$vardir/lib/facter
+
+[agent]
+server=puppet-server
diff --git a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
index 22376cf..f201a7b 100644
--- a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
+++ b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f257790c70561550fd666c6e0044fd89"
SRC_URI = " \
https://downloads.puppetlabs.com/puppet/puppet-${PV}.tar.gz \
file://add_puppet_gemspec.patch \
+ file://puppet.conf \
"
SRC_URI[md5sum] = "cc294da1d51df07bcc7f6cf78bd90ce0"
SRC_URI[sha256sum] = "4a3bd7ddb51072c3dd898a8de158cde204a2d8fd0b84e8ac806b84c074348637"
@@ -34,4 +35,5 @@ do_install_append() {
install -m 655 ${S}/conf/auth.conf ${D}${sysconfdir}/puppet/
install -m 655 ${S}/conf/fileserver.conf ${D}${sysconfdir}/puppet/
install -m 655 ${S}/conf/tagmail.conf ${D}${sysconfdir}/puppet/
+ install -m 655 ${WORKDIR}/puppet.conf ${D}${sysconfdir}/puppet/
}
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [m-c-s][PATCH 3/5] Add the ruby-shadow recipe for the puppet tool
2015-08-20 2:56 [m-c-s][PATCH 1/5] Fix the puppet run failure issue Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 2/5] Add the puppet.conf for the puppet agent Mark Asselstine
@ 2015-08-20 2:56 ` Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 4/5] puppet: move to base layer Mark Asselstine
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Mark Asselstine @ 2015-08-20 2:56 UTC (permalink / raw)
To: bruce.ashfield; +Cc: meta-virtualization
From: Guojian Zhou <guojian.zhou@windriver.com>
The puppet could not add or change the user's password automatically,
because the puppet tool requires the "libshadow" to implement this feature.
Failure information without the "libshadow" feature:
==================================================================
Debug: /User[username]: Provider useradd does not support features
manages_passwords; not managing attribute password
Signed-off-by: Guojian Zhou <guojian.zhou@windriver.com>
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
.../recipes-support/puppet/puppet_3.7.3.bb | 1 +
.../recipes-support/ruby-shadow/ruby-shadow_git.bb | 23 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
create mode 100644 meta-openstack/recipes-support/ruby-shadow/ruby-shadow_git.bb
diff --git a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
index f201a7b..c1743e6 100644
--- a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
+++ b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
@@ -23,6 +23,7 @@ RDEPENDS_${PN} += " \
ruby \
facter \
hiera \
+ ruby-shadow \
"
RUBY_INSTALL_GEMS = "puppet-${PV}.gem"
diff --git a/meta-openstack/recipes-support/ruby-shadow/ruby-shadow_git.bb b/meta-openstack/recipes-support/ruby-shadow/ruby-shadow_git.bb
new file mode 100644
index 0000000..72be016
--- /dev/null
+++ b/meta-openstack/recipes-support/ruby-shadow/ruby-shadow_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Shadow Password Module"
+HOMEPAGE = "https://github.com/apalmblad/ruby-shadow"
+LICENSE = "PD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=137882914e5269b7268f0fe8e28a3f89"
+
+PV = "2.4.1"
+
+SRC_URI = "git://github.com/apalmblad/ruby-shadow.git"
+SRCREV = "4231a4838fd50022b112838f114ee0586e119605"
+S = "${WORKDIR}/git"
+
+inherit ruby
+
+DEPENDS += " \
+ ruby \
+"
+
+RDEPENDS_${PN} += " \
+ ruby \
+"
+
+RUBY_INSTALL_GEMS = "ruby-shadow-${PV}.gem"
+FILES_${PN}-dbg += "/usr/lib64/ruby/gems/*/gems/ruby-shadow-${PV}/.debug/shadow.so"
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [m-c-s][PATCH 4/5] puppet: move to base layer
2015-08-20 2:56 [m-c-s][PATCH 1/5] Fix the puppet run failure issue Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 2/5] Add the puppet.conf for the puppet agent Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 3/5] Add the ruby-shadow recipe for the puppet tool Mark Asselstine
@ 2015-08-20 2:56 ` Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 5/5] puppet: fixup QA warning Mark Asselstine
2015-08-20 17:39 ` [m-c-s][PATCH 1/5] Fix the puppet run failure issue Bruce Ashfield
4 siblings, 0 replies; 6+ messages in thread
From: Mark Asselstine @ 2015-08-20 2:56 UTC (permalink / raw)
To: bruce.ashfield; +Cc: meta-virtualization
Puppet can be used by many 'cloud services', it is not openstack
specific, so moving puppet and puppet related recipes to the
meta-cloud-services base layer. This allows either internal sub-layers
found in meta-cloud-services or external layers to include
meta-cloud-services without being burdened by bbappends and configs
found in meta-openstack.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
.../facter/facter/add_facter_gemspec.patch | 0
.../recipes-support => recipes-support}/facter/facter_2.3.0.bb | 0
.../hiera/hiera/add_hiera_gemspec.patch | 0
{meta-openstack/recipes-support => recipes-support}/hiera/hiera_1.3.4.bb | 0
{meta-openstack/recipes-support => recipes-support}/puppet/README | 0
.../puppet/puppet/add_puppet_gemspec.patch | 0
.../recipes-support => recipes-support}/puppet/puppet/puppet.conf | 0
.../recipes-support => recipes-support}/puppet/puppet_3.7.3.bb | 0
.../recipes-support => recipes-support}/ruby-shadow/ruby-shadow_git.bb | 0
9 files changed, 0 insertions(+), 0 deletions(-)
rename {meta-openstack/recipes-support => recipes-support}/facter/facter/add_facter_gemspec.patch (100%)
rename {meta-openstack/recipes-support => recipes-support}/facter/facter_2.3.0.bb (100%)
rename {meta-openstack/recipes-support => recipes-support}/hiera/hiera/add_hiera_gemspec.patch (100%)
rename {meta-openstack/recipes-support => recipes-support}/hiera/hiera_1.3.4.bb (100%)
rename {meta-openstack/recipes-support => recipes-support}/puppet/README (100%)
rename {meta-openstack/recipes-support => recipes-support}/puppet/puppet/add_puppet_gemspec.patch (100%)
rename {meta-openstack/recipes-support => recipes-support}/puppet/puppet/puppet.conf (100%)
rename {meta-openstack/recipes-support => recipes-support}/puppet/puppet_3.7.3.bb (100%)
rename {meta-openstack/recipes-support => recipes-support}/ruby-shadow/ruby-shadow_git.bb (100%)
diff --git a/meta-openstack/recipes-support/facter/facter/add_facter_gemspec.patch b/recipes-support/facter/facter/add_facter_gemspec.patch
similarity index 100%
rename from meta-openstack/recipes-support/facter/facter/add_facter_gemspec.patch
rename to recipes-support/facter/facter/add_facter_gemspec.patch
diff --git a/meta-openstack/recipes-support/facter/facter_2.3.0.bb b/recipes-support/facter/facter_2.3.0.bb
similarity index 100%
rename from meta-openstack/recipes-support/facter/facter_2.3.0.bb
rename to recipes-support/facter/facter_2.3.0.bb
diff --git a/meta-openstack/recipes-support/hiera/hiera/add_hiera_gemspec.patch b/recipes-support/hiera/hiera/add_hiera_gemspec.patch
similarity index 100%
rename from meta-openstack/recipes-support/hiera/hiera/add_hiera_gemspec.patch
rename to recipes-support/hiera/hiera/add_hiera_gemspec.patch
diff --git a/meta-openstack/recipes-support/hiera/hiera_1.3.4.bb b/recipes-support/hiera/hiera_1.3.4.bb
similarity index 100%
rename from meta-openstack/recipes-support/hiera/hiera_1.3.4.bb
rename to recipes-support/hiera/hiera_1.3.4.bb
diff --git a/meta-openstack/recipes-support/puppet/README b/recipes-support/puppet/README
similarity index 100%
rename from meta-openstack/recipes-support/puppet/README
rename to recipes-support/puppet/README
diff --git a/meta-openstack/recipes-support/puppet/puppet/add_puppet_gemspec.patch b/recipes-support/puppet/puppet/add_puppet_gemspec.patch
similarity index 100%
rename from meta-openstack/recipes-support/puppet/puppet/add_puppet_gemspec.patch
rename to recipes-support/puppet/puppet/add_puppet_gemspec.patch
diff --git a/meta-openstack/recipes-support/puppet/puppet/puppet.conf b/recipes-support/puppet/puppet/puppet.conf
similarity index 100%
rename from meta-openstack/recipes-support/puppet/puppet/puppet.conf
rename to recipes-support/puppet/puppet/puppet.conf
diff --git a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb b/recipes-support/puppet/puppet_3.7.3.bb
similarity index 100%
rename from meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
rename to recipes-support/puppet/puppet_3.7.3.bb
diff --git a/meta-openstack/recipes-support/ruby-shadow/ruby-shadow_git.bb b/recipes-support/ruby-shadow/ruby-shadow_git.bb
similarity index 100%
rename from meta-openstack/recipes-support/ruby-shadow/ruby-shadow_git.bb
rename to recipes-support/ruby-shadow/ruby-shadow_git.bb
--
2.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [m-c-s][PATCH 5/5] puppet: fixup QA warning
2015-08-20 2:56 [m-c-s][PATCH 1/5] Fix the puppet run failure issue Mark Asselstine
` (2 preceding siblings ...)
2015-08-20 2:56 ` [m-c-s][PATCH 4/5] puppet: move to base layer Mark Asselstine
@ 2015-08-20 2:56 ` Mark Asselstine
2015-08-20 17:39 ` [m-c-s][PATCH 1/5] Fix the puppet run failure issue Bruce Ashfield
4 siblings, 0 replies; 6+ messages in thread
From: Mark Asselstine @ 2015-08-20 2:56 UTC (permalink / raw)
To: bruce.ashfield; +Cc: meta-virtualization
Currently we get the following warning when building puppet:
WARNING: QA Issue: /usr/lib/ruby/gems/2.2.0/gems/puppet-3.7.3/
lib/puppet/vendor/safe@underscore@yaml/run@underscore@specs@
underscore@all@underscore@ruby@underscore@versions.sh_puppet
contained in package puppet requires /bin/bash, but no
providers found in its RDEPENDS [file-rdeps]
Adding 'bash' as an RDEPENDS fixes this.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
recipes-support/puppet/puppet_3.7.3.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-support/puppet/puppet_3.7.3.bb b/recipes-support/puppet/puppet_3.7.3.bb
index c1743e6..14e18d9 100644
--- a/recipes-support/puppet/puppet_3.7.3.bb
+++ b/recipes-support/puppet/puppet_3.7.3.bb
@@ -24,6 +24,7 @@ RDEPENDS_${PN} += " \
facter \
hiera \
ruby-shadow \
+ bash \
"
RUBY_INSTALL_GEMS = "puppet-${PV}.gem"
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [m-c-s][PATCH 1/5] Fix the puppet run failure issue
2015-08-20 2:56 [m-c-s][PATCH 1/5] Fix the puppet run failure issue Mark Asselstine
` (3 preceding siblings ...)
2015-08-20 2:56 ` [m-c-s][PATCH 5/5] puppet: fixup QA warning Mark Asselstine
@ 2015-08-20 17:39 ` Bruce Ashfield
4 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2015-08-20 17:39 UTC (permalink / raw)
To: Mark Asselstine; +Cc: meta-virtualization
On 15-08-19 10:56 PM, Mark Asselstine wrote:
> From: Guojian Zhou <guojian.zhou@windriver.com>
>
> The puppet's execution depends on the facter, so add the required
> RDEPENDS in the bb file.
merged to master.
Bruce
>
> The puppet tool run failure information:
> ==============================================
> root@# puppet help
> /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require': cannot load such file -- facter (LoadError)
> from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
> from /usr/lib64/ruby/gems/1.9.1/gems/puppet-3.7.3/lib/puppet.rb:6:in `<top (required)>'
> from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
> from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
> from /usr/lib64/ruby/gems/1.9.1/gems/puppet-3.7.3/lib/puppet/util/command_line.rb:12:in `<top (required)>'
> from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
> from /usr/lib64/ruby/rubygems/custom_require.rb:36:in `require'
> from /usr/lib64/ruby/gems/1.9.1/gems/puppet-3.7.3/bin/puppet:7:in `<top (required)>'
> from /usr/bin/puppet:23:in `load'
> from /usr/bin/puppet:23:in `<main>'
>
> Signed-off-by: Guojian Zhou <guojian.zhou@windriver.com>
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> ---
> meta-openstack/recipes-support/puppet/puppet_3.7.3.bb | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
> index afd9a23..22376cf 100644
> --- a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
> +++ b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb
> @@ -18,6 +18,12 @@ DEPENDS += " \
> hiera \
> "
>
> +RDEPENDS_${PN} += " \
> + ruby \
> + facter \
> + hiera \
> +"
> +
> RUBY_INSTALL_GEMS = "puppet-${PV}.gem"
>
> do_install_append() {
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-08-20 17:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-20 2:56 [m-c-s][PATCH 1/5] Fix the puppet run failure issue Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 2/5] Add the puppet.conf for the puppet agent Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 3/5] Add the ruby-shadow recipe for the puppet tool Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 4/5] puppet: move to base layer Mark Asselstine
2015-08-20 2:56 ` [m-c-s][PATCH 5/5] puppet: fixup QA warning Mark Asselstine
2015-08-20 17:39 ` [m-c-s][PATCH 1/5] Fix the puppet run failure issue Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.