BIGTOP-2726. Bump ambari version to 2.5

1 files changed, 7 insertions, 7 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,
     }