Merge "Containerize HAProxy for the non-ha case"

diff --combined environments/docker.yaml
index 36e4c39,07f704e..5b03b08
--- 1/environments/docker.yaml
--- 2/environments/docker.yaml
+++ b/environments/docker.yaml
@@@ -22,14 -22,13 +22,15 @@@ resource_registry
    OS::TripleO::Services::NeutronServer: ../docker/services/neutron-api.yaml
    OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml
    OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml
 +  OS::TripleO::Services::NeutronMetadataAgent: ../docker/services/neutron-metadata.yaml
    OS::TripleO::Services::NeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml
    OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml
    OS::TripleO::Services::NeutronL3Agent: ../docker/services/neutron-l3.yaml
    OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
+   OS::TripleO::Services::HAProxy: ../docker/services/haproxy.yaml
    OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
    OS::TripleO::Services::MongoDb: ../docker/services/database/mongodb.yaml
 +  OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
    OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml
    OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
    OS::TripleO::Services::SwiftStorage: ../docker/services/swift-storage.yaml
@@@ -42,9 -41,6 +43,9 @@@
    OS::TripleO::Services::AodhNotifier: ../docker/services/aodh-notifier.yaml
    OS::TripleO::Services::AodhListener: ../docker/services/aodh-listener.yaml
    OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml
 +  OS::TripleO::Services::CeilometerAgentCentral: ../docker/services/ceilometer-agent-central.yaml
 +  OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml
 +  OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml
  
    OS::TripleO::PostDeploySteps: ../docker/post.yaml
    OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
@@@ -52,15 -48,13 +53,15 @@@
    OS::TripleO::Services: ../docker/services/services.yaml
  
  parameter_defaults:
 -  # Defaults to 'tripleoupstream'.  Specify a local docker registry
 -  # Example: 192.168.24.1:8787/tripleoupstream
 -  DockerNamespace: tripleoupstream
 -  DockerNamespaceIsRegistry: false
 +  # To specify a local docker registry, enable these
 +  # where 192.168.24.1 is the host running docker-distribution
 +  #DockerNamespace: 192.168.24.1:8787/tripleoupstream
 +  #DockerNamespaceIsRegistry: true
  
    ComputeServices:
      - OS::TripleO::Services::NovaCompute
      - OS::TripleO::Services::NovaLibvirt
      - OS::TripleO::Services::ComputeNeutronOvsAgent
      - OS::TripleO::Services::Docker
 +    - OS::TripleO::Services::CeilometerAgentCompute
 +    - OS::TripleO::Services::Sshd