Remove ELK config before inventory is generated
Remove ELK config before inventory is generated

Currently, we rm env.d/{elasticsearch,logstash,kibana}.yml after we run
openstack-ansible, resulting in ELK-related items being in the
inventory.  This commit updates scripts/deploy.sh to rm these files
before, which means you will no longer get ELK containers if
DEPLOY_ELK != "yes".

Connects https://github.com/rcbops/rpc-openstack/issues/1434

BjoernT/rpc-openstack,shannonmitchell/rpc-openstack,jacobwagner/rpc-openstack,major/rpc-openstack,prometheanfire/rpc-openstack,mancdaz/rpc-openstack,galstrom21/rpc-openstack,mancdaz/rpc-openstack,hughsaunders/rpc-openstack,rcbops/rpc-openstack,galstrom21/rpc-openstack,cfarquhar/rpc-openstack,BjoernT/rpc-openstack,sigmavirus24/rpc-openstack,major/rpc-openstack,sigmavirus24/rpc-openstack,git-harry/rpc-openstack,hughsaunders/rpc-openstack,robb-romans/rpc-openstack,prometheanfire/rpc-openstack,shannonmitchell/rpc-openstack,cloudnull/rpc-openstack,jacobwagner/rpc-openstack,sigmavirus24/rpc-openstack,rcbops/rpc-openstack,git-harry/rpc-openstack,sigmavirus24/rpc-openstack,robb-romans/rpc-openstack,cfarquhar/rpc-openstack,cloudnull/rpc-openstack