Bläddra i källkod

AMBARI-4238. Unable to install hdp - puppet error.(vbrodetskyi)

Vitaly Brodetskyi 11 år sedan
förälder
incheckning
a30ece3e0b
2 ändrade filer med 24 tillägg och 8 borttagningar
  1. 2 1
      ambari-server/pom.xml
  2. 22 7
      pom.xml

+ 2 - 1
ambari-server/pom.xml

@@ -30,6 +30,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <python.ver>python &gt;= 2.6</python.ver>
     <python.ver>python &gt;= 2.6</python.ver>
     <hdpUrlForCentos6>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</hdpUrlForCentos6>
     <hdpUrlForCentos6>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</hdpUrlForCentos6>
+    <ambari-web-dir>${basedir}/../ambari-web/public</ambari-web-dir>
   </properties>
   </properties>
   <build>
   <build>
     <plugins>
     <plugins>
@@ -203,7 +204,7 @@
               <directory>/usr/lib/ambari-server/web</directory>
               <directory>/usr/lib/ambari-server/web</directory>
               <sources>
               <sources>
                 <source>
                 <source>
-                  <location>${basedir}/../ambari-web/public</location>
+                  <location>${ambari-web-dir}</location>
                   <includes>
                   <includes>
                     <include>**</include>
                     <include>**</include>
                   </includes>
                   </includes>

+ 22 - 7
pom.xml

@@ -47,13 +47,6 @@
       <url>http://download.java.net/maven/glassfish/</url>
       <url>http://download.java.net/maven/glassfish/</url>
     </pluginRepository>
     </pluginRepository>
   </pluginRepositories>
   </pluginRepositories>
-  <modules>
-    <module>ambari-web</module>
-    <module>ambari-project</module>
-    <module>ambari-server</module>
-    <module>ambari-agent</module>
-    <module>ambari-client</module>
-  </modules>
   <build>
   <build>
     <pluginManagement>
     <pluginManagement>
       <plugins>
       <plugins>
@@ -161,6 +154,28 @@
     </plugins>
     </plugins>
   </build>
   </build>
   <profiles>
   <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+         <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+         <module>ambari-web</module>
+         <module>ambari-project</module>
+         <module>ambari-server</module>
+         <module>ambari-agent</module>
+         <module>ambari-client</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>static-web</id>
+      <modules>
+         <module>ambari-project</module>
+         <module>ambari-server</module>
+         <module>ambari-agent</module>
+         <module>ambari-client</module>
+      </modules>
+    </profile>
     <profile>
     <profile>
       <id>clover</id>
       <id>clover</id>
       <activation>
       <activation>