Merge lp:~sradhara/charms/trusty/mobilefirst-server/mobilefirst-serverfix into lp:~ibmcharmers/charms/trusty/mobilefirst-server/devel

[sunitha]

[vsr (vsasi)]

review: Approve

[lp:~sradhara/charms/trusty/mobilefirst-server/mobilefirst-serverfix]

39. By sunitha on 2015-10-09

mobilefirst-server charm code checkin

=== modified file 'README.md'
--- README.md	2015-07-23 09:25:57 +0000
+++ README.md	2015-10-09 16:12:21 +0000
@@ -2,161 +2,195 @@
 
 Overview
 --------
- 
- IBM MobileFirst Server 7.0
-
- IBM MobileFirst Server is the middleware tier that provides a gateway between back-end systems and services and the mobile client applications.
- The server enables application authentication, data endpoints/services, data optimization and transformation, push notification management.
-
- This charm installs IBM Installation Manager and IBM MoobileFirst Server product.
- 
- 
- IBM Installation Manager
- 
- IBM Installation Manager is a tool that you can use to install and maintain your IBM software packages.
+This charm installs IBM Installation Manager and IBM MobileFirst Server products.
+
+IBM MobileFirst Server 7.0
+
+IBM MobileFirst Server is the middleware tier that provides a gateway between back-end systems and services and the mobile client applications.
+The server enables application authentication, data endpoints/services, data optimization and transformation, push notification management.
+ 
+For details on IBM MobileFirst Server, as well as information on purchasing the product,
+please visit: [Product Page] [mfs-product-page] and [IBM Knowledge Center] [mfs-v7-info]
+
+
+IBM Installation Manager
+ 
+IBM Installation Manager is a tool that you can use to install and maintain your IBM software packages.
+ 
+For details on IBM Installation Manager, as well as information on purchasing the product,
+please visit: [IMProduct Info] [im-product-page] and [IBM Knowledge Center] [im-v1.7-info]
+
+For Ubuntu(Power and x86_64),  IBM MobileFirst Server package and part numbers is:
+
+    IBM MobileFirst Server 7.0 Installer (CN4V2EN)
+   
 
 Usage
 -------
-
- To install IBM MobileFirst Server you need to install IBM Installation Manager software as prerequisite.
- To install IBM Installation Manager and MobileFirst Server packeges for Ubuntu and put up it's contents on a web server like Apache and configure Apache to serve thi   s package. 
- These package can be then be accessed using a URL from the web server.
-   
- To create repositories in Apache run steps below with admin access
-
-   Install needed packages using below command
-    apt-get install dpkg-dev apache2
-
- Create a repository on Apache server under your Apache repository directory.
- Configure Apache server to allow access to the repository.
-    
- To install the downloaded binaries for IBM Installtion Manager you must agree to the IBM license.  The license file(s) can be found under the `files/archives/licenses` directory on extraction of IBM IM software using the following command.
-
-       tar xvfz *.gz  --strip-components=1
- License can be viewed under the `files/archives/IM/license` directory.
-
- To install the downloaded binaries for IBM MobileFirst Server you must agree to the IBM license.  The license file(s) can be found in below link.
-  
- (http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=&li_formnum=L-BVID-9TCPPM&title=IBM%20MobileFirst%20Platform%20Foundation%20V7.0%20zip%20of%20Installation%20Manager%20Repository%20for%20IBM%20MobileFirst%20Server%20Multiplatform%20English)
-
- Database management system and an application server are required as prerequisites and must be installed before you start the MobileFirst Server installer.
- This charm uses Database management system as "IBM DB2" and application server as "websphere-liberty", so Deploy IBM DB2 and websphere-liberty charms before you deploy MobileFisrt Server on same machine.
- 
-
- First we need to add a juju machine using below command to deploy IBM-DB2, websphere-liberty and MobileFirst Server charms.
-     juju add-machine  #This command will create new juju machine.
-
- Deploy charms as below:
-       juju deploy --to <machine number> websphere-liberty
-       juju deploy --to <machine number> db2
-       juju deploy --to <machine number> mobilefirst-server 
-
- At this point the charm will wait until the user accepts the license.If you agree to the license for IBM Installation Manager and IBM MobileFirst server products, run the following commands:
-
-  juju set mobilefirst-server accept-ibm-im-license=True
-  juju set mobilefirst-server accept-ibm-mobilefirstserver-license=True
-  
- After deploying 3 charms run the relation commands as below 
-   
-  1)setup a relation between IBM DB2 and IBM MobileFirst Server:
-      juju add-relation db2 mobilefirst-server 
-    At this point it will create a 'APPCNTR' database, with out this database MobileFirst Server will not be installed. 
-    
-  2)setup a relation between IBM Websphere-liberty and IBM MobileFirst Server:
-      juju add-relation websphere-liberty mobilefirst-server
-   At this  point it will install MobileFirst Server software.
-
-
- After installing IBM MobileFirst server software open appcenter/worklight consoles as below
-
-       https://<public IP>:9443/worklightconsole
-       http://<public IP>:9081/worklightconsole
-       https://<public IP>:9443/appcenterconsole
-       http://<public IP>:9081/appcenterconsole
-
-
- In case after installing the software, If you set license to "False" mobilefirst server will get uninstalled and to reinstall it you need to accept the license first using "juju set mobilefirst-server accept-ibm-mobilefirstserver-license=True" command and run below relation command to reinstall the product.
-
-         juju add-relation websphere-liberty mobilefirst-server
-
- (Note: you need to remove the relation using "juju remove-relation websphere-liberty mobilefirst-server" command,if any relation exists between these )
-
- To remove a relation between db2 and mobilefirst-server run below command.
-     juju remove-relation db2 mobilefirst-server 
-   At this point it will remove ''APPCNTR' database. 
-
- To remove the relation between websphere-liberty and mobilefirst-server run below command
-    juju remove-relation websphere-liberty mobilefirst-server                                                                                                         
-
+Download packages for IBM MobileFirst Server and IBM Installation Manager for Linux and upload it to your apache
+repository. To download and install the code contained in this charm you must agree to the IBM license.
+
+IBM Installation Manager license file(s) can be found under the `files/archives/licenses` directory on extraction of IBM IM software using the following command.
+
+To view IBM MobileFirst Server license file(s), please visit: [mfsproduct LicenseInfo] [license-page]
+
+
+# Creating the repositories in Apache
+Run below steps with admin access
+
+Install the required packages
+        apt-get install dpkg-dev apache2
+
+Create a repository on Apache server under your Apache repository directory.
+
+        cd <apache-repository-directory>
+        mkdir mobilefirst-server
+
+Place the downloaded IBM MobileFirst Server and IBM Installation Manager packages in the above directory and Configure Apache server to allow access to the repository.
+
+Configure config.yaml with the repository url
+
+ Example : `mobilefirstserver_url: "http://<server-name>/<REPOSITORY_DIR>/mobilefirst-server"`
+
+ Verify repository is set correctly otherwise charm might throw errors.
+
+
+Deploy
+------
+
+The MobileFirst Server charm has to be deployed to a container that has the IBM WebSphere Liberty software installed.
+
+Deploy the IBM DB2 charm and IBM WebSphere Liberty charm then this MobileFirst Server charm.
+
+IBM DB2 charm can be deployed in the same container where your WebSphere liberty and MobileFirst Server charm deployed or it can be deployed in different container.
+
+Steps to deploy mobilefirst-server charm, If you use remote db.
+         
+        - juju deploy mobilefirst-server --to <machine-id1>
+          At this point IBM MobileFirst Server and IBM Installation Manager install
+          will wait for you to accept the License.
+          To install the downloaded binaries you must agree to the IBM license.
+
+If the URL and package is configured in the config.yaml:
+
+          juju set mobilefirst-server accept-ibm-im-license=True
+          juju set mobilefirst-server accept-ibm-mobilefirstserver-license=True
+
+If not,
+
+          juju set mobilefirst-server accept-ibm-im-license=True mobilefirstserver_url=<repository URL> im_package_name=<Installation package name> sha_im=<sha sum of the IM package>
+          juju set mobilefirst-server accept-ibm-mobilefirstserver-license=True mobilefirstserver_url=<repository URL> mobilefirstserver_package_name=<Installation package name> sha_im=<sha sum of the mobilefirst server package>
+
+        - juju deploy websphere-liberty --to <machine-id1>
+          Please go through the websphere-liberty README file to deploy
+          websphere-liberty charm. 
+		
+        - juju deploy db2 --to <machine-id2>
+          Please go through the db2 README file to deploy the db2 charm.
+		  
+        - juju deploy mfs-helper --to <machine-id2>
+          Please go through the mfs-helper README file to deploy the mfs-helper charm.
+
+Now add relations between these charms:
+
+        1. juju add-relation mfs-helper mobilefirst-server
+           Please go through the websphere-liberty README file to deploy
+           websphere-liberty charm. 
+		   
+        2. juju add-relation db2 mobilefirst-server
+		
+        3. juju add-relation websphere-liberty mobilefirst-server
+           At this point it will install mobilefirst server software.   
+
+
+Steps to deploy mobilefirst sever charm, If you use local db.
+
+         juju deploy mobilefirst-server --to <machine-id1>
+         juju deploy db2 --to <machine-id1> 
+         juju deploy websphere-liberty --to <machine-id1>
+
+Now add relations between these charms:
+
+         1. juju add-relation db2 mobilefirst-server
+         2. juju add-relation websphere-liberty mobilefirst-server
+
+
+After installing IBM MobileFirst server software open appcenter/worklight consoles as below
+       
+        `https://<public IP>:9443/worklightconsole`
+        `http://<public IP>:9081/worklightconsole`
+         To login worklightconsole use admin/admin as id/password.
+
+        `https://<public IP>:9443/appcenterconsole`
+        `http://<public IP>:9081/appcenterconsole`
+         To login appcenterconsole use appcenteradmin/admin as id/password.
 
 
 Configuration
---------------
- `MobileFirstServer_url`
-  URL where lies the repository packages for IBM MobileFirst Server and IBM InstallationManager.
-
-
- `accept-ibm-mobilefirstserver-license`
-  Before you can use or install IBM MobileFirst Server,you must accept the terms of International License agreement for Non-Warranted Programs and additional license information.Please read the license agreement carefully. 
-               
- IBM MobileFirst Server license file(s) can be found in below link.
-
- (http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=&li_formnum=L-BVID-9TCPPM&title=IBM%20MobileFirst%20Platform%20Foundation%20V7.0%20zip%20of%20Installation%20Manager%20Repository%20for%20IBM%20MobileFirst%20Server%20Multiplatform%20English)
-    
- Set the value of accept-ibm-mobilefirstserver-license to True if you agree to IBM MobileFirst Server license.
- **The IBM MobileFirst Server software cannot be installed until the terms and conditions are accepted. The charm will not function correctly until this configuration option is set to True.**
-
-
-               
- `accept-ibm-im-license`
- Before you can use or install IBM Installation Manager,you must accept the terms of International License agreement for Non-Warranted Programs and additional license information.Please read the license agreement carefully.
-
- IBM Installation Manager license file(s) can be found in `files/archives//IM/license` directory.
- 
- Set the value of accept-ibm-im-license to True if you agree to IBM Installation Manager license.
- **The IBM Installation Manager Server software cannot be installed until the terms and conditions are accepted.The charm will not function correctly until this configuration option is set to True.**
-
-
- `mobilefirstserver_package_name`
-  MobileFirst Server package name.If its not set,It will take assigned package "MFPF_7.0_INST_MGR_REP_MF_SVR_EN.zip".
-               
-
- `im_package_name'
-  IBM Installation Manager package name.If its not set,It will take assigned package for x86_64 "agent.installer.linux.gtk.x86_64_1.7.1000.20131119_2219.zip" and for ppc64le "agent.installer.linux.gtk.ppc64le_1.8.1000.20141126_2002.zip" 
-                
-
- `sha_im`
- Checksum value to check integrity of IBM Installation Manager package.The Charm uses sha1sum to check the integrity. If empty, it does not carry out the integrity check.
- 
-        
- `sha_mfs`
-  Checksum value to check integrity of IBM MobileFirst Server package.The Charm uses sha1sum to check the integrity.If empty, it does not carry out the integrity check.
-
-  Use sha1sum command as below to find out Checksum value for downloaded package.
-         `sha1sum <Package Location/Package Name> | cut -d" " -f1`
-                            
-                                                                                    
+-------------
+See config.yaml file for more information.
+
+`MobileFirstServer_url`
+
+URL to download IBM MobileFirst Server and IBM Installation Manager packages.
+
+`accept-ibm-mobilefirstserver-license`
+
+The IBM MobileFirst Server software can only be used by accepting the terms and conditions for IBM
+MobileFirst Server License. Setting this option to True indicates that you have read and accepted the
+IBM MobileFirst Server terms and conditions found in the license file.                   
+
+`mobilefirstserver_package_name`
+
+IBM MobileFirst Server package name.
+
+`im_package_name`
+
+IBM Installation Manager package name.
+
+`accept-ibm-im-license`
+
+The IBM Installation Manager software can only be used by accepting the terms and conditions for IBM
+Installation Manager License. Setting this option to True indicates that you have read and accepted the
+IBM Installation Manager terms and conditions found in the license file.
+
+`sha_im`
+
+Checksum value to check integrity of IBM Installation Manager package. The Charm uses
+sha1sum to check the integrity. If empty, it does not carry out the integrity check.
+The command to find the checksum is : sha1sum <Package Name> | cut -d" " -f1
+
+`sha_mfs`
+
+Checksum value to check integrity of IBM MobileFirst Server package. The Charm uses
+sha1sum to check the integrity. If empty, it does not carry out the integrity check.
+The command to find the checksum is : sha1sum <Package Name> | cut -d" " -f1
+
+`liberty-install-path`
+
+IBM WebSphere Liberty install path.
+
+                                  
 IBM Installation Manager(IM) Information
 -----------------------------------------
-
-   Details about IM available [here][im-info].
-
-   Details about IM Version 1.7 available at [IBM Knowledge Center][im-v1.7-info].
-
-   ### (2) Download Information
-
-   Information on procuring IM product is available at the [Product Page][im-product-page]
-   and at the [Passport Advantage Site][passport].
+(1) General Information
+Details about IM available [here][im-info].
+
+Details about IM Version 1.7 available at [IBM Knowledge Center][im-v1.7-info].
+
+(2) Download Information
+Information on procuring IM product is available at the [Product Page][im-product-page]
+and at the [Passport Advantage Site][passport].
 
 
 IBM MobileFirst Server information
----------------------------------------
-   Details about MobileFirst Server 7.0 available at [IBM Knowledge Center][mfs-v7-info].
-
-   ### (2) Download Information
-
-   Information on procuring IM product is available at the [Product Page][mfs-product-page]
-   and at the [Passport Advantage Site][passport].
+-----------------------------------
+(1) General Information
+Details about MobileFirst Server 7.0 available at [IBM Knowledge Center][mfs-v7-info].
+
+(2) Download Information
+Information on procuring IM product is available at the [Product Page][mfs-product-page]
+and at the [Passport Advantage Site][passport].
 
 Contact Information
 ------------------
@@ -165,14 +199,16 @@
  
 <!-- Links -->
 
-   [im-v1.7-info]: http://www-01.ibm.com/support/knowledgecenter/SSDV2W_1.7.0/com.ibm.cic.agent.ui.doc/helpindex_imic.html?cp=SSDV2W_1.7.0%2F0  "IM Version 1.7"
+   [im-v1.7-info]: http://www-01.ibm.com/support/knowledgecenter/SSDV2W_1.7.0/com.ibm.cic.agent.ui.doc/helpindex_imic.html?cp=SSDV2W_1.7.0%2F0
 
-   [im-product-page]: http://www-01.ibm.com/support/docview.wss?uid=swg27025142  "im-product-page Product Page"
+   [im-product-page]: http://www-01.ibm.com/support/docview.wss?uid=swg27025142
 
    [mfs-product-page]: http://www.ibm.com/software/products/en/mobilefirstfoundation "MFS Info"
 
    [mfs-v7-info]: https://www-01.ibm.com/support/knowledgecenter/SSHS8R_7.0.0/com.ibm.worklight.installconfig.doc/install_config/t_ov_server_install.html
+  
+   [license-page]: http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=&li_formnum=L-BVID-9TCPPM&title=IBM%20MobileFirst%20Platform%20Foundation%20V7.0%20zip%20of%20Installation%20Manager%20Repository%20for%20IBM%20MobileFirst%20Server%20Multiplatform%20English
  
-   [passport]: http://www-01.ibm.com/software/passportadvantage/ "Passport Advantage"
+   
 
     

=== modified file 'config.yaml'
--- config.yaml	2015-07-21 11:33:08 +0000
+++ config.yaml	2015-10-09 16:12:21 +0000
@@ -1,17 +1,17 @@
 options:
   mobilefirstserver_url:
      type: string
-     default: ""
+     default: "http://9.124.100.99/debs/mobilefirst-server/"
      description: |
         Download url for MobileFirst Server packages
   mobilefirstserver_package_name:
     type: string
-    default: ""   
+    default: "MFPF_7.0_INST_MGR_REP_MF_SVR_EN.zip"   
     description: |
         MobileFirstServer package name
   im_package_name:
     type: string
-    default: ""
+    default: "agent.installer.linux.gtk.x86_64_1.7.1000.20131119_2219.zip"
     description: |
         Installation Manager package Name
   accept-ibm-mobilefirstserver-license:
@@ -42,4 +42,9 @@
         <sha1sum MFPF_7.0_INST_MGR_REP_MF_SVR_EN.zip | cut -d " " -f1>
         to get the checksum value for IBM Installation Manager pacakage.
         If empty, it does not carry out the integrity check.
+  liberty-install-path:
+    type: string
+    default: "/opt/ibm/wlp"
+    description: |
+        IBM websphere liberty installation path.
 

=== modified file 'files/archives/install-MFS-responsefile.xml'
--- files/archives/install-MFS-responsefile.xml	2015-07-23 16:20:34 +0000
+++ files/archives/install-MFS-responsefile.xml	2015-10-09 16:12:21 +0000
@@ -6,17 +6,17 @@
   <server>
     <repository location='/root/Installfiles/MobileFirst_Platform_Server/disk1'/>
   </server>
-  <profile id='IBM MobileFirst Platform Server_1' installLocation='/opt/ibm/MobileFirst_Platform_Server_1_liberty'>
-    <data key='eclipseLocation' value='/opt/ibm/MobileFirst_Platform_Server_1_liberty'/>
+  <profile id='IBM MobileFirst Platform Server_1' installLocation='/opt/ibm/MobileFirst_Platform_Server_liberty'>
+    <data key='eclipseLocation' value='/opt/ibm/MobileFirst_Platform_Server_liberty'/>
     <data key='user.import.profile' value='false'/>
     <data key='cic.selector.os' value='linux'/>
-    <data key='user.windows.profilesubdir' value='ibm\MobileFirst Platform Server_1'/>
+    <data key='user.windows.profilesubdir' value='ibm\MobileFirst Platform Server'/>
     <data key='user.shortcuts.folder3' value='IBM MobileFirst Platform Server 7.0_1'/>
     <data key='user.update.minimal' value='false'/>
     <data key='user.update.from.version' value=''/>
     <data key='user.writable.data.user' value='root'/>
     <data key='user.database.db2.port' value='50000'/>
-    <data key='user.database.db2.appcenter.dbname' value='APPCNTRA'/>
+    <data key='user.database.db2.appcenter.dbname' value='APPCNTRA'/> 
     <data key='user.database.db2.appcenter.schema' value=''/>
     <data key='user.database.db2.appcenter.password' value='{xyzzy}7Z2T47W3538X52295I'/>
     <data key='user.database.db2.password2' value='{xyzzy}7Z2T47W3538X52295I'/>

=== modified file 'files/archives/uninstall-worklight-responsefile.xml'
--- files/archives/uninstall-worklight-responsefile.xml	2015-05-08 09:08:40 +0000
+++ files/archives/uninstall-worklight-responsefile.xml	2015-10-09 16:12:21 +0000
@@ -33,7 +33,7 @@
   <!-- The declaration of the Installation Manager package group, a.k.a. profile.
        Make sure that the installLocation, if it exists, is empty. -->
   <!--<profile id='IBM Worklight' installLocation='/opt/IBM/Worklight'> -->
-      <profile id='IBM MobileFirst Platform Server_1' installLocation='/opt/ibm/MobileFirst_Platform_Server_1_liberty'>
+      <profile id='IBM MobileFirst Platform Server' installLocation='/opt/ibm/MobileFirst_Platform_Server_liberty'>
 
     <!-- The settings 'eclipseLocation', 'user.import.profile',
          'cic.selector.os', 'cic.selector.ws', 'cic.selector.arch',
@@ -43,7 +43,7 @@
 
   <!-- Specify what Installation Manager should uninstall. -->
   <uninstall modify='false'>
-    <offering id='com.ibm.mobilefirst.foundation.server' profile='IBM MobileFirst Platform Server_1'/>
+    <offering id='com.ibm.mobilefirst.foundation.server' profile='IBM MobileFirst Platform Server'/>
   </uninstall>
 
 </agent-input>

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-07-27 10:35:02 +0000
+++ hooks/config-changed	2015-10-09 16:12:21 +0000
@@ -283,6 +283,9 @@
                                       #Remove corrupt archive file
                                       rm -rf $ARCHIVE_DIR/agent*.zip
                                       exit 0
+                               else
+                                      juju-log "IBM MFSVR: Installation Manager extracted successfully."
+                                     
                                fi
                                     
                       fi
@@ -314,7 +317,6 @@
        juju-log "IBM MFSVR: Acceptable values for license is 'True' or 'False'"
 fi
 
-juju-log "IBM MFSVR: Installation Manager downloaded and installed sucessfully."
 
 juju-log "IBM MFSVR: Config change hook completed." 
 ####################################################################################

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2015-07-27 10:35:02 +0000
+++ hooks/db-relation-changed	2015-10-09 16:12:21 +0000
@@ -1,45 +1,48 @@
 #!/bin/bash
 
 set -e
-hooksdir=$PWD
-DB2_INSTALL_PATH=/opt/ibm/db2/V10.5
+#hooksdir=$PWD
 db2user=`relation-get dbusername`
 db2password=`relation-get dbuserpw`
 db2instancename=`relation-get db2_instance_name`
 db2port=`relation-get port`
 db2_address=`relation-get hostname`
+db2_install_path=/opt/ibm/db2
 
-#Copy db2 details in db2values.dat file"
+#Copy db2 details in to "db2values.dat" file"
 echo "dbusrname=$db2user" > db2values.dat ; echo "dbpwd=$db2password" >> db2values.dat ; echo "db2_address=$db2_address" >> db2values.dat ; echo "db2instancename=$db2instancename" >> db2values.dat ; echo "db2port=$db2port" >> db2values.dat 
 
-#Check if db2 exist
-if ! [ -d "$DB2_INSTALL_PATH"/bin ]; then
-        juju-log "IBM MFSVR: DB2 Not found.Exiting!!"
-        exit 0
-else
-        juju-log "IBM MFSVR: DB2 found."
-fi
-
-
 
 if [ -z "$db2_address" ]; then
       juju-log "No data sent yet"
       exit 0
 fi
 
+juju-log "db2_address : $db2_address"
+private_address=`unit-get private-address`
+juju-log "private_address : $private_address"
 
-#check whether db2 is already started or not if not started it will exit
-if su - $db2user -c 'netstat -an | grep '$db2port; then
-      juju-log "IBM MFSVR: DB2 started in port $db2port"
-else
-      juju-log "IBM MFSVR: DB2 not started in port $db2port"
-      exit 1
+if [ "$db2_address" == "$private_address" ]; then
+       database1=`su - $db2user -c 'db2 list db directory' | grep "APPCNTR" | cut -d"=" -f2`
+       if [ "$database1" == "" ]; then
+              juju-log "IBM MFSVR: Create APPCNTR database"
+              juju-log "IBM MFSVR: Creating APPCNTR database for MobileFirstServer,without APPCNTR database MobileFirst Server will not be installed"
+              su - $db2user -c 'db2 ATTACH TO '$db2user''
+              su - $db2user -c 'db2 CREATE DATABASE APPCNTR USING CODESET UTF-8 TERRITORY US'
+              juju-log "IBM MFSVR: APPCNTR database created "
+              su - $db2user -c "db2 CONNECT TO APPCNTR"
+       else
+              juju-log "IBM MFSVR: APPCNTR database is exist"
+       fi
+       #Copy db2 jar file
+       juju-log "IBM MFSVR: Copying db2jar files"
+       cp $db2_install_path/V10.5/java/db2jcc.jar $CHARM_DIR/files/archives
+       cp $db2_install_path/V10.5/java/db2jcc4.jar $CHARM_DIR/files/archives
+       cp $db2_install_path/V10.5/java/db2jcc_license_*.jar $CHARM_DIR/files/archives
+       
 fi
+   
+    
 
-juju-log "IBM MFSVR: creating APPCNTR database for MobileFirstServer,without APPCNTR database MobileFirst Server will not be installed"
-su - $db2user -c 'db2 ATTACH TO '$db2user''
-su - $db2user -c 'db2 CREATE DATABASE APPCNTR USING CODESET UTF-8 TERRITORY US'
-juju-log "Database created "
-su - $db2user -c "db2 CONNECT TO APPCNTR"
 juju-log "IBM MFSVR: db-relation-change hook completed"
 

=== modified file 'hooks/db-relation-departed'
--- hooks/db-relation-departed	2015-07-27 10:35:02 +0000
+++ hooks/db-relation-departed	2015-10-09 16:12:21 +0000
@@ -1,16 +1,24 @@
 #!/bin/bash
 set -e
-juju-log "starting db-relation-departed hook"
-DB2_INSTALL_PATH=/opt/ibm/db2/V10.5
-dbusrname=`relation-get dbusername`
+juju-log "IBM MFSVR: Starting db-relation-departed hook"
+db2user=`relation-get dbusername`
+db2_address=`relation-get hostname`
+private_address=`unit-get private-address`
+juju-log "private_address : $private_address"
 
-#while removing relation, it will remove APPCNTR database
-if  [ -d "$DB2_INSTALL_PATH"/bin ]; then
-         juju-log "IBM MFSVR: Dropping the APPCNTR DB ..."
-         su - $dbusrname -c 'db2 drop database APPCNTR'
-         juju-log "IBM MFSVR: Dropped APPCNTR db"
+juju-log "db2_address :$db2_address"
+if [ "$db2_address" == "$private_address" ]; then
+      database1=`su - $db2user -c 'db2 list db directory' | grep "APPCNTR" | cut -d"=" -f2`
+             
+      if [ "$database"== "" ]; then
+            juju-log "IBM MFSVR: APPCNTR database is not exist"
+      else
+            juju-log "MFS HELPER: Removing APPCNTR database"
+            su - $db2user -c 'db2 drop database APPCNTR'
+      fi
 fi
 
+
 juju-log "IBM MFSVR: db-relation-departed completed sucessfully"
 
        

=== modified file 'hooks/stop'
--- hooks/stop	2015-07-27 10:35:02 +0000
+++ hooks/stop	2015-10-09 16:12:21 +0000
@@ -1,20 +1,28 @@
 #!/bin/bash
 set -e
-
-LIBERTY_INSTALL_PATH=/opt/ibm/wlp
-
-juju-log "Stop worklight server"
-
+juju-log "IBM MFSVR: Starting stop hook"
+
+LIBERTY_INSTALL_PATH=`config-get liberty-install-path`
 if [ -d $LIBERTY_INSTALL_PATH/usr/servers/worklight ]; then
-        $LIBERTY_INSTALL_PATH/bin/server stop worklight
-        if [ $? == 0 ]; then
-              juju-log "worklight server stopped sucessfully"
-        else
-              juju-log "worklight server not running"
-              exit 0
-        fi
+      juju-log "IBM MFSVR: Removing liberty server"
+      rm -rf $LIBERTY_INSTALL_PATH/usr/servers/worklight
+      if [ $? == 0 ]; then
+           juju-log "IBM MFSVR: worklight server removed successfully"
+      else
+           juju-log "IBM MFSVR: Failed to remove worklight server"
+      fi
+         
+      rm -rf $LIBERTY_INSTALL_PATH/output/servers/worklight
+      if [ $? == 0 ]; then
+           juju-log "IBM MFSVR: worklight server removed successfully from output folder"
+      else
+           juju-log "IBM MFSVR: Failed to remove worklight server from oputput folder"
+      fi
+
 else
-        juju-log "Worklight server not created yet"
-        exit 0
+
+      juju-log "IBM MFSVR: Server is not exist"
 fi
 
+
+juju-log "IBM MFSVR: Completed stop hook"

=== modified file 'hooks/website-relation-changed'
--- hooks/website-relation-changed	2015-07-27 10:35:02 +0000
+++ hooks/website-relation-changed	2015-10-09 16:12:21 +0000
@@ -1,14 +1,15 @@
 #!/bin/bash
 
 set -e
-LIBERTY_INSTALL_PATH=/opt/ibm/wlp
-MobileFirstServer_PATH=/opt/ibm/MobileFirst_Platform_Server_1_liberty
+LIBERTY_INSTALL_PATH=`config-get liberty-install-path`
+MobileFirstServer_PATH=/opt/ibm/MobileFirst_Platform_Server_liberty
 IM_INSTALL_PATH=/opt/IBM/InstallationManager
 DB2_INSTALL_PATH=/opt/ibm/db2/V10.5
 MOBILEFIRSTSERVER_ARCHIVE_DIR=`pwd`
 hooksdir=$PWD
 
-#Get db2 values from db2values.dat file
+
+#Get db2 details from db2values.dat file
 if [ -f "$hooksdir"/db2values.dat ]; then
         . db2values.dat
         echo "dbusrname is $dbusrname"
@@ -50,14 +51,15 @@
 #Edit install responsefile with Liberty and db2 details
 edit_responsefile()
 {
-      echo " Editing the response file"
+      juju-log "IBM MFSR: Editing response file"
       sed -i 's|/root/IBM/IBMIMShared|/opt/ibm/IBMIMShared|g' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
       sed -i 's|/root/Installfiles/MobileFirst_Platform_Server/disk1|'$CHARM_DIR'/files/archives/MobileFirst_Platform_Server/disk1|g' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
       sed -i 's/APPCNTRA/APPCNTR/' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
       sed -i 's/50000/'$db2port'/' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
       sed -i 's/db2inst1/'$dbusrname'/' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
       sed -i 's/localhost/'$db2_address'/' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
-      sed -i 's|/opt/ibm/db2/V10.5/java/db2jcc.jar|'$DB2_INSTALL_PATH'/java/db2jcc.jar|g' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
+      #sed -i 's|/opt/ibm/db2/V10.5/java/db2jcc.jar|'$DB2_INSTALL_PATH'/java/db2jcc.jar|g' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
+      sed -i 's|/opt/ibm/db2/V10.5/java/db2jcc.jar|'$CHARM_DIR'/files/archives/db2jcc.jar|g' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
       sed -i 's/waserver1/worklight/' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
       sed -i 's|/root/IBM/WebSphere/wlp|'$LIBERTY_INSTALL_PATH'|g' $CHARM_DIR/files/archives/install-MFS-responsefile.xml
  }
@@ -65,16 +67,16 @@
 #update configure_liberty_db2_file with IBM Mobile first server details after installing the product
 edit_configure_liberty_db2_file()
 {
-  echo " Editing configure_liberty_db2.xml file"
+  juju-log "IBM MFSR: Editing configure_liberty_db2.xml file"
   sed -i '/"database.db2.wladmin.password"/c\<property name="database.db2.wladmin.password" value="'$dbpwd'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"database.db2.worklight.password"/c\<property name="database.db2.worklight.password" value="'$dbpwd'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"database.db2.worklightreports.password"/c\<property name="database.db2.worklightreports.password" value="'$dbpwd'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"worklight.server.install.dir"/c\<property name="worklight.server.install.dir" value="'$MobileFirstServer_PATH'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"worklight.contextroot"/c\<property name="worklight.contextroot" value="/worklight"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
-  sed -i '/"database.db2.host"/c\<property name="database.db2.host" value="localhost"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
+  sed -i '/"database.db2.host"/c\<property name="database.db2.host" value="'$db2_address'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"database.db2.port"/c\<property name="database.db2.port" value="'$db2port'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"database.db2.instance"/c\<property name="database.db2.instance" value="db2inst1"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
-  sed -i '/"database.db2.driver.dir"/c\<property name="database.db2.driver.dir" value="'$DB2_INSTALL_PATH'/java"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
+  sed -i '/"database.db2.driver.dir"/c\<property name="database.db2.driver.dir" value="'$CHARM_DIR'/files/archives"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"database.db2.wladmin.dbname"/c\<property name="database.db2.wladmin.dbname" value="WRKLGHT"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"database.db2.wladmin.schema"/c\<property name="database.db2.wladmin.schema" value="WLADMIN"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"database.db2.wladmin.username"/c\<property name="database.db2.wladmin.username" value="'$dbusrname'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
@@ -86,22 +88,22 @@
   sed -i '/"database.db2.worklightreports.username"/c\<property name="database.db2.worklightreports.username" value="'$dbusrname'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"appserver.was.installdir"/c\<property name="appserver.was.installdir" value="'$LIBERTY_INSTALL_PATH'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
   sed -i '/"appserver.was85liberty.serverInstance"/c\<property name="appserver.was85liberty.serverInstance" value="worklight"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
-juju-log "configure_liberty_db2_file file edit done"
+  sed -i '/"worklight.project.war.file"/c\<property name="worklight.project.war.file" value="'$CHARM_DIR'/files/archives/test.war"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/configure-liberty-db2.xml
 }
 
 #update create_database_db2_file with IBM Mobile first server details after installing the product
 edit_create_database_db2_file()
 {
-  echo " Editing create-database-db2.xml file"
+  juju-log "IBM MFSR: Editing create-database-db2.xml file"
   sed -i '/"database.db2.admin.password"/c\<property name="database.db2.admin.password" value="'$dbpwd'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"database.db2.wladmin.password"/c\<property name="database.db2.wladmin.password" value="'$dbpwd'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"database.db2.worklight.password"/c\<property name="database.db2.worklight.password" value="'$dbpwd'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"database.db2.worklightreports.password"/c\<property name="database.db2.worklightreports.password" value="'$dbpwd'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"worklight.server.install.dir"/c\<property name="worklight.server.install.dir" value="'$MobileFirstServer_PATH'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
-  sed -i '/"database.db2.host"/c\<property name="database.db2.host" value="localhost"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
+  sed -i '/"database.db2.host"/c\<property name="database.db2.host" value="'$db2_address'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"database.db2.port"/c\<property name="database.db2.port" value="'$db2port'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"database.db2.instance"/c\<property name="database.db2.instance" value="db2inst1"/>'  $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
-  sed -i '/"database.db2.driver.dir"/c\<property name="database.db2.driver.dir" value="'$DB2_INSTALL_PATH'/java"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
+  sed -i '/"database.db2.driver.dir"/c\<property name="database.db2.driver.dir" value="'$CHARM_DIR'/files/archives"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"database.db2.admin.username"/c\<property name="database.db2.admin.username" value="'$dbusrname'"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"database.db2.wladmin.dbname"/c\<property name="database.db2.wladmin.dbname" value="WRKLGHT"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
   sed -i '/"database.db2.wladmin.schema"/c\<property name="database.db2.wladmin.schema" value="WLADMIN"/>' $MobileFirstServer_PATH/WorklightServer/configuration-samples/create-database-db2.xml
@@ -132,43 +134,45 @@
           fi
 
    else
-          juju-log "Liberty is not installed"
+          juju-log "IBM MFSVR: Liberty is not installed"
+          exit 0
    fi
 
 }
 
-#After installing the product we need to run ant commands to create WORKLIGHT database
+#Post install configurations.
 postworklightinstall_configuration()
 {
 
-   juju-log "editing_configure-liberty-db2.xml file"
+   juju-log "IBM MFSVR: Editing configure-liberty-db2.xml file"
    edit_configure_liberty_db2_file
-   juju-log "editing create-database-db2.xml file"
+   juju-log "IBM MFSVR: Editing create-database-db2.xml file"
    edit_create_database_db2_file
-   juju-log "Running ant commands"
+
+   juju-log "IBM MFSVR: Running ant commands"
    cd $MobileFirstServer_PATH/WorklightServer/configuration-samples
    #Run create admdatabases command
    ant -f create-database-db2.xml admdatabases
    if [ $? -eq 0 ]; then
-          juju-log "IBM MFSVR: ant create admddatabase command ran sucessfully"
+          juju-log "IBM MFSVR: ant create admddatabase command ran successfully"
    else
           juju-log "IBM MFSVR: ant create admddatabase command failed to run"
           exit 1 
    fi
 
-   #Run create-database-db2.xml databases command
+   #Run create-database-db2.xml databases command 
    ant -f create-database-db2.xml databases
    if [ $? -eq 0 ]; then
-          juju-log "IBM MFSVR: ant create database command ran sucessfully"
+          juju-log "IBM MFSVR: ant create database command ran successfully"
    else
-          juju-log "IBM MFSVR: ant create database failed to run"
+          juju-log "IBM MFSVR: ant create database command failed to run"
           exit 1
    fi
 
    #Run configure admdatabases command
    ant -f configure-liberty-db2.xml admdatabases
    if [ $? -eq 0 ]; then
-          juju-log "IBM MFSVR: ant configure liberty admddatabase command ran sucessfully"
+          juju-log "IBM MFSVR: ant configure liberty admddatabase command ran successfully"
    else
           juju-log "IBM MFSVR: ant configure liberty admddatabase command failed to run"
           exit 1
@@ -177,16 +181,26 @@
    #Run configure databases command
    ant -f configure-liberty-db2.xml databases
    if [ $? -eq 0 ]; then
-          juju-log "IBM MFSVR: ant configure liberty database command ran sucessfully"
+          juju-log "IBM MFSVR: ant configure liberty database command ran successfully"
    else
           juju-log "IBM MFSVR: ant configure liberty database command failed to run"
           exit 1
    fi
     
-   #Run configure databases  adminstall command
+   #Run adminstall command
    ant -f configure-liberty-db2.xml adminstall    
    if [ $? -eq 0 ]; then
-          juju-log "IBM MFSVR: ant configure liberty database command ran sucessfully"
+          juju-log "IBM MFSVR: ant adminstall command ran successfully"
+   else
+          juju-log "IBM MFSVR: ant adminstall command failed to run"
+          exit 1
+   fi
+  
+      
+   #Run install command to configure sample runtime environment
+   ant -f configure-liberty-db2.xml install
+   if [ $? -eq 0 ]; then
+          juju-log "IBM MFSVR: ant configure liberty database command ran successfully"
    else
           juju-log "IBM MFSVR: ant configure liberty database command failed to run"
           exit 1
@@ -194,7 +208,7 @@
 
  }
 
-#restart liberty server after installing the software to launch webconsole/Appcenterconsole
+#Restart liberty server after post install configuration to launch webconsole/Appcenterconsole
 restart_worklightserver()
 {
   
@@ -224,7 +238,7 @@
 juju-log "IBM MFSVR:  Begin website-relation-change hook "
 mobilefirstserver_license_accepted=`config-get accept-ibm-mobilefirstserver-license`
 
-#checks if liberty is exist or not
+#Check if liberty is installed 
 if ! [ -d $LIBERTY_INSTALL_PATH ]; then
          juju-log "IBM MFSVR: WebSphere Liberty Not found.Exiting!!"
          exit 0
@@ -233,19 +247,9 @@
 fi
 
 
-#checks if db2 is exist or not
-if ! [ -d $DB2_INSTALL_PATH ]; then
-        juju-log "IBM MFSVR: Db2 Not found.Exiting!!"
-        exit 0
-else
-   
-        juju-log "IBM MFSVR: Db2 found."
-fi
-
-
 httpsport=`relation-get https-port`
 if [ -z "$httpsport" ]; then
-       juju-log "No data sent yet"
+       juju-log "IBM MFSVR: No data sent yet"
        exit 0
 fi
 
@@ -253,30 +257,32 @@
 juju-log "IBM MFSVR: IBM MobileFirst Server install START:"
 if [ $mobilefirstserver_license_accepted == False ]; then
          juju-log "IBM MFSVR: IBM mobilefirstserver License not accepted."
+         exit 0
 
 elif [ $mobilefirstserver_license_accepted == True ]; then
          juju-log "License accepted"
-         #create worklight server
+         #Create worklight server
          create_worklightserver
          WL_installed=`is_worklight_installed`
          juju-log $WL_installed
          if [ $WL_installed == False ]; then
                  #Check MobileFirst Server package availability
                  if [ -d  $CHARM_DIR/files/archives/MobileFirst_Platform_Server/disk1 ]; then
-                          juju-log "MobileFirst server Packages are available for installation."
-                          #edit install response file."
+                          juju-log "IBM MFSVR: MobileFirst server Packages are available for installation."
+                          #Edit install response file."
                           edit_responsefile
                           cd $IM_INSTALL_PATH/eclipse/tools
                           juju-log "IBM MFSVR: Installing MobileFirst Server package."
                           ./imcl input $CHARM_DIR/files/archives/install-MFS-responsefile.xml -acceptLicense -showProgress
                           juju-log "IBM MFSVR: Installation of MobileFirst server complete."
-                          #check install sucessful or not
+
+                          #Check install successful or not
                           if [ -d $MobileFirstServer_PATH/WorklightServer ]; then
                                   juju-log "IBM MFSVR: Install Sucessful and moving to post install configuration"
-                                  #Configure system values  for IBM MobileFirst Server
+                                  #Configure system values for IBM MobileFirst Server
                                   postworklightinstall_configuration
-                                  juju-log "IBM MFSVR: updated create_database_db2_file and configure_liberty_db2_file files"
-                                  #restart worklight server 
+                                  juju-log "IBM MFSVR: Modified create_database_db2_file and configure_liberty_db2_file files"
+                                  #Restart worklight server 
                                   restart_worklightserver
                           else
                                   juju-log "IBM MFSVR: Install failed"
@@ -285,7 +291,6 @@
  
                  else
                           juju-log "MobileFirst server Packages are missing. Please check README file."
-                          juju-log "Upgrade MobileFirst server charm after adding the MobileFirst server packages"
                           exit 1
                  fi
          fi

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-07-23 06:49:52 +0000
+++ metadata.yaml	2015-10-09 16:12:21 +0000
@@ -7,6 +7,8 @@
    - misc
 subordinate: false
 requires:
+  helper:
+    interface: helper
   db:
     interface: db2
   website:

=== modified file 'tests/00-setup'
--- tests/00-setup	2015-07-21 11:33:08 +0000
+++ tests/00-setup	2015-10-09 16:12:21 +0000
@@ -9,6 +9,7 @@
 MFS_URL=${MFS_URL?Error: IBM MFS repository must be defined in tests/00-setup}
 MFS_PKG=${MFS_PKG?Error: IBM MFS package be defined in tests/00-setup}
 IM_PKG=${IM_PKG?Error: IBM MFS package be defined in tests/00-setup}
+WLP_URL=${WLP_URL}
 
 # Add a local configuration file
 cat << EOF > local.yaml
@@ -19,6 +20,8 @@
     mobilefirstserver_url: "$MFS_URL"
     mobilefirstserver_package_name: "$MFS_PKG"
     im_package_name: "$IM_PKG"
+Liberty:
+    liberty-install-path: "$WLP_URL"
 
 EOF
 

=== modified file 'tests/10-deploy.py'
--- tests/10-deploy.py	2015-07-23 16:20:34 +0000
+++ tests/10-deploy.py	2015-10-09 16:12:21 +0000
@@ -61,10 +61,13 @@
          d.add('websphere-liberty' , placement="mobilefirst-server")
          d.configure('websphere-liberty', { 'accept-ibm-websphere-license': True })
          d.configure('websphere-liberty', { 'accept-ibm-java-license': True })
-         d.add('db2' , placement="mobilefirst-server")
+         d.add('db2')
+         d.add('mfs-helper' , placement="db2")
          d.configure('db2', { 'accept-ibm-db2-license': True, 'db2_url': url, 'db2_package_name' : pkg })
          d.configure('mobilefirst-server', { 'accept-ibm-im-license': True, 'mobilefirstserver_url': mfsurl, 'im_package_name' : impkg })
          d.configure('mobilefirst-server', { 'accept-ibm-mobilefirstserver-license': True, 'mobilefirstserver_url': mfsurl, 'mobilefirstserver_package_name' : mfspkg })
+         # Add relation mobilefirst server to mfs-helper
+         d.relate('mobilefirst-server:helper', 'mfs-helper:helper')
          # Add relation mobilefirst server to db2
          d.relate('mobilefirst-server:db', 'db2:db')
          # Add relation mobilefirst server to websphere-liberty

=== modified file 'tests/local.yaml'
--- tests/local.yaml	2015-07-21 11:33:08 +0000
+++ tests/local.yaml	2015-10-09 16:12:21 +0000
@@ -2,7 +2,9 @@
     db2_url: "http://9.124.100.99/debs/DB2"
     db2_package: "DB2_Svr_10.5.0.3_Linux_x86-64.tar.gz"
 mobilefirst-server:
-    mobilefirstserver_url: "http://9.124.100.99/debs/WORKLIGHT"
+    mobilefirstserver_url: "http://9.124.100.99/debs/mobilefirst-server"
     mobilefirstserver_package_name: "MFPF_7.0_INST_MGR_REP_MF_SVR_EN.zip"
     im_package_name: "agent.installer.linux.gtk.x86_64_1.7.1000.20131119_2219.zip"
+Liberty:
+    liberty-install-path: "opt/ibm/wlp"