Merge branch 'master' into vim51_win8

client/pom.xml

@@ -268,11 +268,6 @@
             </goals>
             <configuration>
               <target>
-                <exec executable="cp">
-                    <arg value="-r" />
-                    <arg value="${basedir}/../scripts" />
-                    <arg value="${basedir}/target/generated-webapp/WEB-INF/classes/scripts" />
-                </exec>
 
                 <copy
                   todir="${basedir}/target/generated-webapp/WEB-INF/">
@@ -286,6 +281,13 @@
                     <include name="resources/**/*" />
                   </fileset>
                 </copy>
+
+                <exec executable="cp">
+                    <arg value="-r" />
+                    <arg value="${basedir}/../scripts" />
+                    <arg value="${basedir}/target/generated-webapp/WEB-INF/classes/" />
+                </exec>
+
                 <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
                   <fileset dir="${basedir}/../services/console-proxy/server/dist">
                     <include name="systemvm.zip" />

docs/en-US/management-server-install-nfs-shares.xml

@@ -26,7 +26,7 @@
     <title>Prepare NFS Shares</title>
     <para>&PRODUCT; needs a place to keep primary and secondary storage (see Cloud Infrastructure Overview). Both of these can be NFS shares. This section tells how to set up the NFS shares before adding the storage to &PRODUCT;.</para>
     <note><title>Alternative Storage</title>
-        <para>NFS is not the only option for primary or secondary storage. For example, you may use a Ceph RDB cluster, GlusterFS, iSCSI, and otthers.</para>
+        <para>NFS is not the only option for primary or secondary storage. For example, you may use Ceph RBD, GlusterFS, iSCSI, and others. The choice of storage system will depend on the choice of hypervisor and whether you are dealing with primary or secondary storage.</para>
     </note>
     <para>The requirements for primary and secondary storage are described in:</para>
     <itemizedlist>

docs/en-US/nfs-shares-on-management-server.xml

@@ -27,9 +27,9 @@
     <para>This section tells how to set up NFS shares for primary and secondary storage on the same node with the Management Server.  This is more typical of a trial installation, but is technically possible in a larger deployment. It is assumed that you will have less than 16TB of storage on the host.</para> 
     <para>The exact commands for the following steps may vary depending on your operating system version.</para>
     <orderedlist>
-        <listitem><para>On Ubuntu/Debian systems, you'll need to install the nfs-kernel-server package:</para>
+        <listitem><para>On RHEL/CentOS systems, you'll need to install the nfs-utils package:</para>
         <programlisting>
-$ sudo apt-get install nfs-kernel-server
+$ sudo yum install nfs-utils
         </programlisting>
         </listitem>
         <listitem><para>On the Management Server host, create two directories that you will use for primary and secondary storage. For example:</para>

packaging/centos63/cloud.spec

@@ -143,6 +143,7 @@ Apache CloudStack command line interface
 
 %package awsapi
 Summary: Apache CloudStack AWS API compatibility wrapper
+Requires: %{name}-management = %{_ver}
 %description awsapi
 Apache Cloudstack AWS API compatibility wrapper
 
@@ -160,7 +161,7 @@ echo Doing CloudStack build
 cp packaging/centos63/replace.properties build/replace.properties
 echo VERSION=%{_maventag} >> build/replace.properties
 echo PACKAGE=%{name} >> build/replace.properties
-mvn package -Dsystemvm
+mvn -P awsapi package -Dsystemvm
 
 %install
 [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -215,7 +216,7 @@ install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir
 install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
 
 cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
-cp -r client/target/cloud-client-ui-*-SNAPSHOT/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
+cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
 
 # Don't package the scripts in the management webapp
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
@@ -271,6 +272,14 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
 cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/
 install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloudapis.py
 
+# AWS API
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup
+cp -r awsapi/target/cloud-awsapi-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge
+install -D awsapi-setup/setup/cloud-setup-bridge ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-setup-bridge
+install -D awsapi-setup/setup/cloudstack-aws-api-register ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-aws-api-register
+cp -r awsapi-setup/db/mysql/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup
+
 %clean
 [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
@@ -305,6 +314,11 @@ if [ ! -f %{_datadir}/cloudstack/management/webapps/client/WEB-INF/classes/scrip
     echo %{_datadir}/cloudstack/management/webapps/client/WEB-INF/classes/scripts/vm/hypervisor/xenserver/
 fi
 
+%post awsapi
+if [ -d "%{_datadir}/%{name}-management" ] ; then
+   ln %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
+fi
+
 #No default permission as the permission setup is complex
 %files management
 %defattr(-,root,root,-)
@@ -408,6 +422,11 @@ fi
 %doc NOTICE
 
 %files awsapi
+%defattr(0644,cloud,cloud,0755)
+%{_datadir}/%{name}-bridge/webapps/bridge
+%attr(0644,root,root) %{_datadir}/%{name}-bridge/setup/*
+%attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register
+%attr(0755,root,root) %{_bindir}/cloudstack-setup-bridge
 %doc LICENSE
 %doc NOTICE