Merge pull request #4 from jpuskar/1_0_4

1.0.4
Fixed bv_max_attachment_size bug.
Updated readme to reflect jpuskar-db2 default path changes.

.gitignore

@@ -5,4 +5,5 @@ vagrant/
 custom
 cognos_11_installer.properties
 spec/fixtures
-pkg/
+pkg/
+*.bin

Changelog.md

@@ -1,5 +1,8 @@
 # puppet-cognos changelog
 
+## v0.1.4
++ Fixed bv_max_attachment_size bug.
+
 ## v0.1.3
 + Fixed install path bug.
 

README.md

@@ -18,7 +18,10 @@ This module installs and configures a basic cognos server using db2.
 
 ### Setup Requirements
 + The cognos install binary must be pre-staged and the parameters named `installer_source_dir` and `installer_filename` configured.
-+ DB2 must already be installed, and the cognos class parameters `db2_install_path`, `db2_service_name`, and `db2_instance_user` must be correct. See init.pp for the defaults.
++ DB2 must already be installed\*, and the cognos class parameters `db2_install_path`, `db2_service_name`, and `db2_instance_user` must be correct. See init.pp for the defaults.
+
+\*Note: the provided Vagrantfile will install db2 using the jpuskar-db2 module. See the heading below labeled 'Development'.
+
 
 ## Usage
 
@@ -211,8 +214,9 @@ The folder structure must look like the following:
 puppet-cognos/Vagrantfile
 puppet-cognos/vagrant/
 puppet-cognos/vagrant/ca_srv_lnxi38664_11.0.5.16111917.bin
-puppet-cognos/vagrant/exp/
-puppet-cognos/vagrant/exp/db2setup
+puppet-cognos/vagrant/v10/
+puppet-cognos/vagrant/v10/exp/
+puppet-cognos/vagrant/v10/exp/db2setup
 ```
 
 ## Troubleshooting

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "jpuskar-cognos",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "author": "jpuskar",
   "summary": "Installs and configures Cognos.",
   "license": "Apache-2.0",

templates/config/cogconfig_fragment_05.xml.erb

@@ -56,7 +56,7 @@ Master configuration file for all IBM Cognos components.
        that can be uploaded to the Business Viewpoint server.  -->
   <!-- A value of 0 indicates that the maximum size is unlimited.  -->
   <crn:parameter name="bvMaxAttachmentSize" disabled="true">
-    <crn:value xsi:type="xsd:unsignedShort"><%= scope['cognos::bv_max_attachment_size'] %>1024</crn:value>
+    <crn:value xsi:type="xsd:unsignedShort"><%= scope['cognos::bv_max_attachment_size'] %></crn:value>
   </crn:parameter>
   <!-- deploymentPath: Specifies the location where deployment archives are stored.  -->
   <!-- Because a deployment archive can contain sensitive information, for security reasons