BIGTOP-2726. Bump ambari version to 2.5
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1fff67c7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1fff67c7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1fff67c7 Branch: refs/heads/master Commit: 1fff67c749f70d3918e9763975f11e91acb862ed Parents: 082a3e1 Author: Roman Shaposhnik <[email protected]> Authored: Tue Mar 28 21:32:12 2017 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Tue Mar 28 21:32:12 2017 -0700 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/ambari/manifests/init.pp | 14 +++++++------- bigtop-packages/src/rpm/ambari/SPECS/ambari.spec | 2 ++ bigtop.bom | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/1fff67c7/bigtop-deploy/puppet/modules/ambari/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/ambari/manifests/init.pp b/bigtop-deploy/puppet/modules/ambari/manifests/init.pp index 839f73c..9f8bb25 100644 --- a/bigtop-deploy/puppet/modules/ambari/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/ambari/manifests/init.pp @@ -28,20 +28,20 @@ class ambari { } exec { - "server setup": - command => "/usr/sbin/ambari-server setup -s", + "mpack install": + command => "/bin/bash -c 'echo yes | /usr/sbin/ambari-server install-mpack --purge --verbose --mpack=/var/lib/ambari-server/resources/odpi-ambari-mpack-1.0.0.0-SNAPSHOT.tar.gz'", require => [ Package["ambari-server"] ] } - # FIXME: this is currently a workaround for 2.5 - file { ["/var/lib/ambari-server/resources/stacks/Bigtop", "/var/lib/ambari-server/resources/stacks/Bigtop/1.2.0"]: - ensure => 'directory', - require => [ Package["ambari-server"] ] + exec { + "server setup": + command => "/usr/sbin/ambari-server setup -s", + require => [ Package["ambari-server"], Exec["mpack install"] ] } service { "ambari-server": ensure => running, - require => [ Package["ambari-server"], Exec["server setup"], File["/var/lib/ambari-server/resources/stacks/Bigtop/1.2.0"] ], + require => [ Package["ambari-server"], Exec["server setup"] ], hasrestart => true, hasstatus => true, } http://git-wip-us.apache.org/repos/asf/bigtop/blob/1fff67c7/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec index 6d6be69..b51f9a1 100644 --- a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec +++ b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec @@ -497,6 +497,8 @@ Ambari Client %attr(755,root,root) /etc/init.d/ambari-agent %attr(755,root,root) /var/lib/ambari-agent/data %attr(755,root,root) /var/lib/ambari-agent/cache +%attr(755,root,root) /var/lib/ambari-agent/cred +%attr(755,root,root) /var/lib/ambari-agent/tools %files client %defattr(644,root,root,755) http://git-wip-us.apache.org/repos/asf/bigtop/blob/1fff67c7/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index d5aed8b..0c9b550 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -476,7 +476,7 @@ bigtop { 'ambari' { name = 'ambari' relNotes = 'Apache Ambari' - version { base = '2.4.2'; pkg = base; release = 1 } + version { base = '2.5.0'; pkg = base; release = 1 } tarball { destination = "apache-$name-${version.base}-src.tar.gz" source = destination } url { download_path = "/$name/$name-${version.base}/"
