disable ec2 and s3 services for >= kilo

[JuanJo Ciarlante]

Setup: openstack kilo HA deployment via juju, using latest charms from trunk(s),
with (only) the following extra settings at deployer config (vs icehouse):

   openstack-origin: cloud:trusty-kilo
   source: cloud:trusty-updates/kilo

Issue: keystone catalog is missing ec2, s3 endpoints:

$ keystone catalog|egrep Service:
Service: compute
Service: network
Service: volumev2
Service: product-streams
Service: metering
Service: cloudformation
Service: volume
Service: orchestration
Service: object-store
Service: image
Service: identity

$ juju ssh nova-cloud-controller/0 sudo nova-manage version
2015.1.0

[JuanJo Ciarlante (jjo)]

FYI ec2, s3 services are setup and running at n-c-c/0:
$ juju ssh nova-cloud-controller/0 "sudo egrep -r '(ec2|s3)_listen' /etc/nova"
/etc/nova/nova.conf:s3_listen = 0.0.0.0
/etc/nova/nova.conf:ec2_listen = 0.0.0.0
/etc/nova/nova.conf:s3_listen_port = 3323
/etc/nova/nova.conf:ec2_listen_port = 8763

$ juju ssh nova-cloud-controller/0 "sudo netstat -ntlp |egrep '(3323|8763)'"
tcp 0 0 0.0.0.0:3323 0.0.0.0:* LISTEN 101264/python
tcp 0 0 0.0.0.0:8763 0.0.0.0:* LISTEN 101222/python

[Corey Bryant (corey.bryant)]

The s3 and ec2 endpoints were dropped by the nova-cloud-controller charm for kilo+ because ec2 is deprecated and s3 is insecure. It looks like we should also drop any related services if they're still running.