Merge "Fix README and deployer scripts for liberty"

README.md

@@ -63,7 +63,7 @@ Assumes that an active monasca-api server is running.
 ### Other info
 
 Since we don't have full repo of ceilometer, we setup the ceilometer repo in venv and copy monasca integration files in there,
-and run the unit tests over that code. At present this is tested against ceilometer stable/kilo branch, if you need to test
+and run the unit tests over that code. At present this is tested against ceilometer stable/liberty branch, if you need to test
 against different branch you can change it in test-requirements.txt
 
 Relevant files are:

deployer/README.md

@@ -2,8 +2,7 @@
 
 #Few gotchas:
 
-- Monasca-ui doesn't get setup with this since it has some compatibilty issues with stable/kilo
-- Monasca-events doesn't get installed either, as it is attempting to install oslo at system level causing issues with devstack
+- Monasca-ui doesn't get setup with this since it has compatibilty issues with oslo.utils version in stable/liberty
 - One of the monasca smoke test fails, but it is at the end and shouldn't affect the operation of ceilosca
 
 #Pre-Requisites:

deployer/ceilosca.sh

@@ -78,11 +78,6 @@ disable_monasca_ui_role()
 
 }
 
-disable_monasca_events_installation()
-{
-        sed -i "s/- include: events.yml/#- include: events.yml/" $WORK_DIR/mini-mon.yml
-}
-
 add_to_etc_hosts()
 {
         if ! grep -q "$TARGET_IP devstack mini-mon" /etc/hosts; then
@@ -109,7 +104,6 @@ setup_devstack
 install_ansible
 get_monasca_files
 disable_monasca_ui_role
-disable_monasca_events_installation
 add_to_etc_hosts
 add_monasca_ips_to_local_net_if
 run_ceilosca