Merge "Remove compose from the repostiory since its dead code"

28 files changed, 0 insertions, 612 deletions

diff --git a/README.rst b/README.rst
index 5904a24e7..0bbdd05cb 100644
--- a/README.rst
+++ b/README.rst
@@ -65,10 +65,6 @@ Directories
 
 -  ansible - Contains Anible playbooks to deploy Kolla in Docker
    containers.
--  compose - Contains the docker-compose files serving as a compose
-   reference. Note compose support is removed from Kolla. These are for
-   community members which want to use Kolla container content without
-   Ansible.
 -  demos - Contains a few demos to use with Kolla.
 -  devenv - Contains an OpenStack-Heat based development environment.
 -  doc - Contains documentation.
diff --git a/compose/README.rst b/compose/README.rst
deleted file mode 100644
index f570b88fb..000000000
--- a/compose/README.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Docker compose
-==============
-
-All compose support in Kolla has been completely removed as of liberty-3.
-
-The files in this directory are only for reference by the TripleO project.
-As they stand today, they likely don't work.  There is a blueprint to port
-them to support the CONFIG_EXTERNAL config strategy.
diff --git a/compose/ceilometer.yml b/compose/ceilometer.yml
deleted file mode 100644
index dac86495b..000000000
--- a/compose/ceilometer.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-ceilometerapi:
-  image: kollaglue/centos-rdo-ceilometer-api:latest
-  name: ceilometer-api
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-ceilometercentral:
-  image: kollaglue/centos-rdo-ceilometer-central:latest
-  name: ceilometer-central
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-ceilometeralarm:
-  image: kollaglue/centos-rdo-ceilometer-alarm:latest
-  name: ceilometer-alarm
-  net: "host"
-  restart: always
-  env_file:
-    - openstack.env
-
-ceilometercollector:
-  image: kollaglue/centos-rdo-ceilometer-collector:latest
-  name: ceilometer-collector
-  net: "host"
-  restart: always
-  env_file:
-    - openstack.env
-
-ceilometernotification:
-  image: kollaglue/centos-rdo-ceilometer-notification:latest
-  name: ceilometer-notification
-  net: "host"
-  restart: always
-  env_file:
-    - openstack.env
diff --git a/compose/cinder-api-scheduler.yml b/compose/cinder-api-scheduler.yml
deleted file mode 100644
index 86bbf53b6..000000000
--- a/compose/cinder-api-scheduler.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-cinderapi:
-   image: kollaglue/centos-rdo-cinder-api:latest
-   name: cinder-api
-   net: host
-   restart: always
-   env_file:
-    - openstack.env
-
-cinderscheduler:
-   image: kollaglue/centos-rdo-cinder-scheduler:latest
-   name: cinder-scheduler
-   net: host
-   restart: always
-   env_file:
-    - openstack.env
diff --git a/compose/cinder-backup.yml b/compose/cinder-backup.yml
deleted file mode 100644
index b7c82f339..000000000
--- a/compose/cinder-backup.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-cinderbackup:
-   image: kollaglue/centos-rdo-cinder-backup:latest
-   name: cinder-backup
-   net: host
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /dev:/dev
diff --git a/compose/cinder-volume.yml b/compose/cinder-volume.yml
deleted file mode 100644
index 005e19ed7..000000000
--- a/compose/cinder-volume.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-cinderdata:
-  image: kollaglue/centos-rdo-data:latest
-  name: cinderdata
-  restart: on-failure
-
-cindervolume:
-   image: kollaglue/centos-rdo-cinder-volume:latest
-   name: cinder-volume
-   net: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /lib/modules:/lib/modules:ro
-    - /dev:/dev
-   volumes_from:
-    - cinderdata
diff --git a/compose/designate.yml b/compose/designate.yml
deleted file mode 100644
index 94b432bfa..000000000
--- a/compose/designate.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-# The DNSaaS REST api from where zones and records are added or removed.
-designateapi:
-  image: kollaglue/centos-rdo-designate-api:latest
-  name: designate-api
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-# The central dispatches the API requests and pushes requests further down to
-# pool-manager and the database for storage.
-designatecentral:
-  image: kollaglue/centos-rdo-designate-central:latest
-  name: designate-central
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-# The pool-manager will push new zones to the backend so they can slave them.
-designatepoolmanager:
-  image: kollaglue/centos-rdo-designate-poolmanager:latest
-  name: designate-poolmanager
-  net: "host"
-  restart: always
-  env_file:
-    - openstack.env
-
-# Bind9 backend and state storage.
-designatebackendbind9data:
-  image: kollaglue/centos-rdo-data:latest
-  name: designate-backend-bind9-data
-  restart: on-failure
-
-designatebackendbind9:
-  image: kollaglue/centos-rdo-designate-backend-bind9:latest
-  name: designate-backend-bind9
-  net: "host"
-  restart: always
-  env_file:
-    - openstack.env
-  volumes_from:
-    - designatebackendbind9data
-
-# The MDNS service acts as the primary (or hidden-master) nameserver and uses
-# AXFR/IXFR commands to inform the slaves (which realy listen for queries from
-# $world) about updates.
-designatemdns:
-  image: kollaglue/centos-rdo-designate-mdns:latest
-  name: designate-mdns
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-# The Sink service gets notifications from the message queue about events like
-# instance creation/deletion or floating IP association/disassociation.
-# It then creates records for instances included in events.
-designatesink:
-  image: kollaglue/centos-rdo-designate-sink:latest
-  name: designate-sink
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
diff --git a/compose/galeradb.yml b/compose/galeradb.yml
deleted file mode 100644
index 740625524..000000000
--- a/compose/galeradb.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-galeradbdata:
-  image: kollaglue/centos-rdo-data:latest
-  name: galeradb-data
-  restart: on-failure
-
-galeraapp:
-  image: kollaglue/centos-rdo-galera:latest
-  name: galera-app
-  restart: always
-  net: "host"
-  privileged: true
-  env_file:
-    - openstack.env
-  volumes_from:
-    - galeradbdata
diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml
deleted file mode 100644
index 316e0ad4e..000000000
--- a/compose/glance-api-registry.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-glancedata:
-  image: kollaglue/centos-rdo-glance-data:latest
-  name: glance-data
-
-glanceregistry:
-  image: kollaglue/centos-rdo-glance-registry:latest
-  name: glance-registry
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-  volumes_from:
-   - glancedata
-
-glanceapi:
-  image: kollaglue/centos-rdo-glance-api:latest
-  name: glance-api
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-  volumes_from:
-   - glancedata
diff --git a/compose/gnocchi.yml b/compose/gnocchi.yml
deleted file mode 100644
index cd3ead330..000000000
--- a/compose/gnocchi.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-gnocchiapi:
-  image: kollaglue/centos-rdo-gnocchi-api:latest
-  name: gnocchiapi
-  restart: always
-  env_file:
-    - openstack.env
-  net: "host"
-
-gnocchistatsd:
-  image: kollaglue/centos-rdo-gnocchi-statsd:latest
-  name: gnocchistatsd
-  restart: always
-  env_file:
-    - openstack.env
-  net: "host"
diff --git a/compose/heat-api-engine.yml b/compose/heat-api-engine.yml
deleted file mode 100644
index 84b01c10d..000000000
--- a/compose/heat-api-engine.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-heatapi:
-  image: kollaglue/centos-rdo-heat-api:latest
-  name: heat-api
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-heatengine:
-  image: kollaglue/centos-rdo-heat-engine:latest
-  name: heat-engine
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-heatapicfn:
-  image: kollaglue/centos-rdo-heat-api-cfn:latest
-  name: heat-api-cfn
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
diff --git a/compose/horizon.yml b/compose/horizon.yml
deleted file mode 100644
index b8ef035cc..000000000
--- a/compose/horizon.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-horizon:
-  image: kollaglue/centos-rdo-horizon:latest
-  name: horizon
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
diff --git a/compose/keepalived.yml b/compose/keepalived.yml
deleted file mode 100755
index 11689e513..000000000
--- a/compose/keepalived.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-keepalived:
-  image: kollaglue/centos-rdo-keepalived:latest
-  name: keepalived
-  restart: always
-  net: "host"
-  privileged: true
-  env_file:
-   - openstack.env
diff --git a/compose/keystone.yml b/compose/keystone.yml
deleted file mode 100644
index f84c86968..000000000
--- a/compose/keystone.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-keystone:
-  image: kollaglue/centos-rdo-keystone:latest
-  name: keystone
-  restart: always
-  net: "host"
-  env_file:
-   - openstack.env
diff --git a/compose/magnum-api-conductor.yml b/compose/magnum-api-conductor.yml
deleted file mode 100644
index 4aeaf78f0..000000000
--- a/compose/magnum-api-conductor.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-magnumapi:
-  image: kollaglue/centos-rdo-magnum-api:latest
-  name: magnum-api
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-magnumconductor:
-  image: kollaglue/centos-rdo-magnum-conductor:latest
-  name: magnum-conductor
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
diff --git a/compose/mariadb.yml b/compose/mariadb.yml
deleted file mode 100644
index f20e8d718..000000000
--- a/compose/mariadb.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-mariadbdata:
-  image: kollaglue/centos-rdo-data:latest
-  name: mariadbdata
-  restart: on-failure
-
-mariadbapp:
-  image: kollaglue/centos-rdo-mariadb-app:latest
-  name: mariadbapp
-  restart: always
-  env_file:
-    - openstack.env
-  volumes_from:
-    - mariadbdata
-  net: "host"
diff --git a/compose/memcached.yml b/compose/memcached.yml
deleted file mode 100644
index 77c7904dc..000000000
--- a/compose/memcached.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-memcached:
-  image: kollaglue/centos-rdo-memcached:latest
-  name: memcached
-  restart: always
-  net: "host"
-  env_file:
-   - openstack.env
diff --git a/compose/murano-api-engine.yml b/compose/murano-api-engine.yml
deleted file mode 100644
index faf5e9ccd..000000000
--- a/compose/murano-api-engine.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# NOTE(pbourke): no binary images for murano are available
-muranoapi:
-  image: kollaglue/centos-source-murano-api:latest
-  name: murano-api
-  restart: always
-  net: "host"
-  env_file:
-   - openstack.env
-
-muranoengine:
-  image: kollaglue/centos-source-murano-engine:latest
-  name: murano-engine
-  restart: always
-  net: "host"
-  env_file:
-   - openstack.env
diff --git a/compose/neutron-agents.yml b/compose/neutron-agents.yml
deleted file mode 100644
index 895624dff..000000000
--- a/compose/neutron-agents.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-neutronagents:
-  image: kollaglue/centos-rdo-neutron-agents:latest
-  name: neutron-agents
-  net: "host"
-  privileged: true
-  restart: always
-  volumes:
-    - /var/run/netns/:/var/run/netns/
-    - /lib/modules:/lib/modules:ro
-  env_file:
-   - openstack.env
diff --git a/compose/neutron-linuxbridge-agent.yml b/compose/neutron-linuxbridge-agent.yml
deleted file mode 100644
index e8bf23718..000000000
--- a/compose/neutron-linuxbridge-agent.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-neutronlinuxbridgeagent:
-  image: kollaglue/centos-rdo-neutron-linuxbridge-agent:latest
-  name: neutron-linuxbridge-agent
-  net: "host"
-  privileged: true
-  restart: always
-  volumes:
-    - /run/netns/:/run/netns/:ro
-    - /lib/modules:/lib/modules:ro
-  env_file:
-   - openstack.env
diff --git a/compose/neutron-server.yml b/compose/neutron-server.yml
deleted file mode 100644
index b2da8bd93..000000000
--- a/compose/neutron-server.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-neutronserver:
-  image: kollaglue/centos-rdo-neutron-server:latest
-  name: neutron-server
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml
deleted file mode 100644
index 6071d5bcd..000000000
--- a/compose/nova-api-compute-network.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-computedata:
-   image: kollaglue/centos-rdo-data:latest
-   name: computedata
-
-libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:latest
-   name: libvirt
-   net: host
-   pid: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /lib/modules:/lib/modules:ro
-   volumes_from:
-    - computedata
-
-novanetwork:
-   image: kollaglue/centos-rdo-nova-network:latest
-   name: nova-network
-   net: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /lib/modules:/lib/modules:ro
-   volumes_from:
-    - computedata
-
-# Unfortunately nova api needs to be privileged as it wants to run
-# a firewall command.
-# nova-metadata api is required in multi_host nova network mode.
-# http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
-novaapi:
-  image: kollaglue/centos-rdo-nova-api:latest
-  name: nova-api
-  privileged: True
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-  volumes:
-   - /lib/modules:/lib/modules:ro
-
-novacompute:
-   image: kollaglue/centos-rdo-nova-compute:latest
-   name: nova-compute
-   net: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /lib/modules:/lib/modules:ro
-   volumes_from:
-    - computedata
diff --git a/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
deleted file mode 100644
index 1f80e768e..000000000
--- a/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-novaconductor:
-  image: kollaglue/centos-rdo-nova-conductor:latest
-  name: nova-conductor
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-# Unfortunately nova api needs to be privileged as it wants to run
-# a firewall command.
-novaapi:
-  image: kollaglue/centos-rdo-nova-api:latest
-  name: nova-api
-  privileged: True
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-novascheduler:
-  image: kollaglue/centos-rdo-nova-scheduler:latest
-  name: nova-scheduler
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-novaconsoleauth:
-   image: kollaglue/centos-rdo-nova-consoleauth:latest
-   name: nova-consoleauth
-   net: "host"
-   restart: always
-   env_file:
-    - openstack.env
-
-novanovncproxy:
-   image: kollaglue/centos-rdo-nova-novncproxy:latest
-   name: nova-novncproxy
-   net: "host"
-   restart: always
-   env_file:
-    - openstack.env
diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml
deleted file mode 100644
index 106aa046e..000000000
--- a/compose/nova-compute-network.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-computedata:
-   image: kollaglue/centos-rdo-data:latest
-   name: computedata
-
-libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:latest
-   name: libvirt
-   net: host
-   pid: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /dev:/dev
-   volumes_from:
-    - computedata
-
-novanetwork:
-   image: kollaglue/centos-rdo-nova-network:latest
-   name: nova-network
-   net: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /lib/modules:/lib/modules:ro
-   volumes_from:
-    - computedata
-
-novacompute:
-   image: kollaglue/centos-rdo-nova-compute:latest
-   name: nova-compute
-   net: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /dev:/dev
-   volumes_from:
-    - computedata
diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml
deleted file mode 100644
index d75752618..000000000
--- a/compose/nova-compute.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-computedata:
-   image: kollaglue/centos-rdo-data:latest
-   name: computedata
-
-libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:latest
-   name: libvirt
-   net: host
-   pid: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /lib/modules:/lib/modules:ro
-    - /dev:/dev
-   volumes_from:
-    - computedata
-
-novacompute:
-   image: kollaglue/centos-rdo-nova-compute:latest
-   name: nova-compute
-   net: host
-   privileged: true
-   restart: always
-   env_file:
-    - openstack.env
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /lib/modules:/lib/modules:ro
-    - /dev:/dev
-   volumes_from:
-    - computedata
diff --git a/compose/rabbitmq.yml b/compose/rabbitmq.yml
deleted file mode 100644
index 504ed9bee..000000000
--- a/compose/rabbitmq.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-rabbitmq:
-  image: kollaglue/centos-rdo-rabbitmq:latest
-  name: rabbitmq
-  restart: always
-  net: "host"
-  env_file:
-   - openstack.env
diff --git a/compose/swift-proxy.yml b/compose/swift-proxy.yml
deleted file mode 100644
index 0f59e7bdb..000000000
--- a/compose/swift-proxy.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-swiftproxyserver:
-   image: kollaglue/centos-rdo-swift-proxy-server:latest
-   name: swiftproxyserver
-   restart: always
-   net: host
-   env_file:
-    - openstack.env
diff --git a/compose/swift-storage.yml b/compose/swift-storage.yml
deleted file mode 100644
index 35bebd69e..000000000
--- a/compose/swift-storage.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-swiftdata:
-   image: kollaglue/centos-rdo-data:latest
-   name: swiftdata
-
-swiftobjectserver:
-   image: kollaglue/centos-rdo-swift-object-server:latest
-   name: swiftobjectserver
-   restart: always
-   net: host
-   env_file:
-    - openstack.env
-   volumes_from:
-    - swiftdata
-
-swiftobjectauditor:
-   image: kollaglue/centos-rdo-swift-object-auditor:latest
-   name: swiftobjectauditor
-   restart: always
-   net: host
-   env_file:
-    - openstack.env
-   volumes_from:
-    - swiftdata
-
-swiftobjectexpirer:
-   image: kollaglue/centos-rdo-swift-object-expirer:latest
-   name: swiftobjectexpirer
-   restart: always
-   net: host
-   env_file:
-    - openstack.env
-   volumes_from:
-    - swiftdata
-
-swiftobjectreplicator:
-   image: kollaglue/centos-rdo-swift-object-replicator:latest
-   name: swiftobjectreplicator
-   restart: always
-   net: host
-   env_file:
-    - openstack.env
-   volumes_from:
-    - swiftdata
-
-swiftobjectupdater:
-   image: kollaglue/centos-rdo-swift-object-updater:latest
-   name: swiftobjectupdater
-   restart: always
-   net: host
-   env_file:
-    - openstack.env
-   volumes_from:
-    - swiftdata
-
-swiftcontainerserver:
-   image: kollaglue/centos-rdo-swift-container-server:latest
-   name: swiftcontainerserver
-   restart: always
-   net: host
-   env_file:
-    - openstack.env
-   volumes_from:
-    - swiftdata
-
-swiftaccountserver:
-   image: kollaglue/centos-rdo-swift-account-server:latest
-   name: swiftaccountserver
-   restart: always
-   net: host
-   env_file:
-    - openstack.env
-   volumes_from:
-    - swiftdata