diff options
| -rw-r--r-- | bigtop-deploy/puppet/modules/ambari/manifests/init.pp | 14 | ||||
| -rw-r--r-- | bigtop-packages/src/rpm/ambari/SPECS/ambari.spec | 2 | ||||
| -rw-r--r-- | bigtop.bom | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/bigtop-deploy/puppet/modules/ambari/manifests/init.pp b/bigtop-deploy/puppet/modules/ambari/manifests/init.pp index 839f73c7..9f8bb25b 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, } diff --git a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec index 6d6be69c..b51f9a11 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) @@ -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}/" |