Bring Kolla inline with FHS

This brings Kolla images inline with FHS and should make finding
locations of things more consistent and reliable with the linux world
at large.

Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8
Closes-Bug: #1485742

34 files changed, 49 insertions, 51 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index c17cfa25e..28924b0d5 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -188,10 +188,9 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD
 
 {% endif %}
 
-COPY set_configs.py /opt/kolla/
-
+COPY set_configs.py /usr/local/bin/kolla_set_configs
 COPY start.sh /usr/local/bin/kolla_start
 RUN touch /usr/local/bin/kolla_extend_start \
-    && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /opt/kolla/set_configs.py
+    && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs
 
 CMD ["kolla_start"]
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py
index 941e74ca2..12da192c0 100644
--- a/docker/base/set_configs.py
+++ b/docker/base/set_configs.py
@@ -140,7 +140,7 @@ def set_permissions(data):
 
 
 def load_config():
-    config_file = '/opt/kolla/config_files/config.json'
+    config_file = '/var/lib/kolla/config_files/config.json'
     LOG.info('Loading config file at {}'.format(config_file))
 
     # Attempt to read config file
diff --git a/docker/base/start.sh b/docker/base/start.sh
index 7d89f636c..bbe321a80 100644
--- a/docker/base/start.sh
+++ b/docker/base/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 # Processing /opt/kolla/config_files/config.json
-python /opt/kolla/set_configs.py
+python /usr/local/bin/kolla_set_configs
 CMD=$(cat /run_command)
 ARGS=""
 
diff --git a/docker/ceilometer/ceilometer-alarm/config-external.sh b/docker/ceilometer/ceilometer-alarm/config-external.sh
index 2835bd5aa..2c4607530 100644
--- a/docker/ceilometer/ceilometer-alarm/config-external.sh
+++ b/docker/ceilometer/ceilometer-alarm/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 
diff --git a/docker/ceilometer/ceilometer-api/config-external.sh b/docker/ceilometer/ceilometer-api/config-external.sh
index 2835bd5aa..2c4607530 100644
--- a/docker/ceilometer/ceilometer-api/config-external.sh
+++ b/docker/ceilometer/ceilometer-api/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 
diff --git a/docker/ceilometer/ceilometer-central/config-external.sh b/docker/ceilometer/ceilometer-central/config-external.sh
index 2835bd5aa..2c4607530 100644
--- a/docker/ceilometer/ceilometer-central/config-external.sh
+++ b/docker/ceilometer/ceilometer-central/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 
diff --git a/docker/ceilometer/ceilometer-collector/config-external.sh b/docker/ceilometer/ceilometer-collector/config-external.sh
index 2835bd5aa..2c4607530 100644
--- a/docker/ceilometer/ceilometer-collector/config-external.sh
+++ b/docker/ceilometer/ceilometer-collector/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 
diff --git a/docker/ceilometer/ceilometer-compute/config-external.sh b/docker/ceilometer/ceilometer-compute/config-external.sh
index 2835bd5aa..2c4607530 100644
--- a/docker/ceilometer/ceilometer-compute/config-external.sh
+++ b/docker/ceilometer/ceilometer-compute/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 
diff --git a/docker/ceilometer/ceilometer-notification/config-external.sh b/docker/ceilometer/ceilometer-notification/config-external.sh
index 2835bd5aa..2c4607530 100644
--- a/docker/ceilometer/ceilometer-notification/config-external.sh
+++ b/docker/ceilometer/ceilometer-notification/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf"
 TARGET="/etc/ceilometer/ceilometer.conf"
 OWNER="ceilometer"
 
diff --git a/docker/designate/designate-api/config-external.sh b/docker/designate/designate-api/config-external.sh
index ce302ea0c..eb9299276 100644
--- a/docker/designate/designate-api/config-external.sh
+++ b/docker/designate/designate-api/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index 843209214..47eff2122 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -6,7 +6,8 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
 
 RUN yum install -y bind \
     && yum clean all \
-    && cp -pr /var/named /opt/kolla/var-named
+    && mkdir -p /var/lib/kolla/ \
+    && cp -pr /var/named /var/lib/kolla/var-named
 
     {% endif %}
 {% endif %}
diff --git a/docker/designate/designate-backend-bind9/config-external.sh b/docker/designate/designate-backend-bind9/config-external.sh
index ce302ea0c..eb9299276 100644
--- a/docker/designate/designate-backend-bind9/config-external.sh
+++ b/docker/designate/designate-backend-bind9/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 
diff --git a/docker/designate/designate-central/config-external.sh b/docker/designate/designate-central/config-external.sh
index ce302ea0c..eb9299276 100644
--- a/docker/designate/designate-central/config-external.sh
+++ b/docker/designate/designate-central/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 
diff --git a/docker/designate/designate-mdns/config-external.sh b/docker/designate/designate-mdns/config-external.sh
index ce302ea0c..eb9299276 100644
--- a/docker/designate/designate-mdns/config-external.sh
+++ b/docker/designate/designate-mdns/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 
diff --git a/docker/designate/designate-poolmanager/config-external.sh b/docker/designate/designate-poolmanager/config-external.sh
index ce302ea0c..eb9299276 100644
--- a/docker/designate/designate-poolmanager/config-external.sh
+++ b/docker/designate/designate-poolmanager/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 
diff --git a/docker/designate/designate-sink/config-external.sh b/docker/designate/designate-sink/config-external.sh
index ce302ea0c..eb9299276 100644
--- a/docker/designate/designate-sink/config-external.sh
+++ b/docker/designate/designate-sink/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
+SOURCE="/var/lib/kolla/designate/designate.conf"
 TARGET="/etc/designate/designate.conf"
 OWNER="designate"
 
diff --git a/docker/gnocchi/gnocchi-api/config-external.sh b/docker/gnocchi/gnocchi-api/config-external.sh
index 59639ba63..4d54a843b 100644
--- a/docker/gnocchi/gnocchi-api/config-external.sh
+++ b/docker/gnocchi/gnocchi-api/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf"
+SOURCE="/var/lib/kolla/gnocchi-api/gnocchi-api.conf"
 TARGET="/etc/gnocchi/gnocchi-api.conf"
 OWNER="gnocchi"
 
diff --git a/docker/gnocchi/gnocchi-statsd/config-external.sh b/docker/gnocchi/gnocchi-statsd/config-external.sh
index 59639ba63..4d54a843b 100644
--- a/docker/gnocchi/gnocchi-statsd/config-external.sh
+++ b/docker/gnocchi/gnocchi-statsd/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf"
+SOURCE="/var/lib/kolla/gnocchi-api/gnocchi-api.conf"
 TARGET="/etc/gnocchi/gnocchi-api.conf"
 OWNER="gnocchi"
 
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2
index e7a4abddd..4bd73b7e0 100644
--- a/docker/haproxy/Dockerfile.j2
+++ b/docker/haproxy/Dockerfile.j2
@@ -3,8 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install \
-        haproxy \
+RUN yum -y install haproxy \
     && yum clean all
 
 {% elif base_distro == 'ubuntu' %}
@@ -19,9 +18,8 @@ RUN apt-get install -y --no-install-recommends haproxy \
 
 {% endif %}
 
-COPY ensure_latest_config.sh /opt/kolla/
-
+COPY ensure_latest_config.sh /usr/local/bin/kolla_ensure_haproxy_latest_config
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start /opt/kolla/ensure_latest_config.sh
+RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ensure_haproxy_latest_config
 
 {{ include_footer }}
diff --git a/docker/haproxy/ensure_latest_config.sh b/docker/haproxy/ensure_latest_config.sh
index af20175a6..9a34f1758 100644
--- a/docker/haproxy/ensure_latest_config.sh
+++ b/docker/haproxy/ensure_latest_config.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 CURRENT_CONFIG_HASH=$(sha1sum /etc/haproxy/haproxy.cfg | cut -f1 -d' ')
-NEW_CONFIG_HASH=$(sha1sum /opt/kolla/config_files/haproxy.cfg | cut -f1 -d' ')
+NEW_CONFIG_HASH=$(sha1sum /var/lib/kolla/config_files/haproxy.cfg | cut -f1 -d' ')
 
 if [[ $CURRENT_CONFIG_HASH != $NEW_CONFIG_HASH ]]; then
     changed=changed
-    source /opt/kolla/config-external.sh
+    python /usr/local/bin/kolla_set_configs
     /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -sf $(cat /run/haproxy.pid)
 fi
 
diff --git a/docker/ironic/ironic-api/config-external.sh b/docker/ironic/ironic-api/config-external.sh
index b838ee19d..025bef5b6 100644
--- a/docker/ironic/ironic-api/config-external.sh
+++ b/docker/ironic/ironic-api/config-external.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SOURCE="/opt/kolla/ironic-api/ironic.conf"
+SOURCE="/var/lib/kolla/ironic-api/ironic.conf"
 TARGET="/etc/ironic/ironic.conf"
 OWNER="ironic"
 
diff --git a/docker/magnum/magnum-api/config-external.sh b/docker/magnum/magnum-api/config-external.sh
index 573043f7d..055efd839 100644
--- a/docker/magnum/magnum-api/config-external.sh
+++ b/docker/magnum/magnum-api/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/magnum/magnum-api/magnum.conf"
+SOURCE="/var/lib/kolla/magnum/magnum-api/magnum.conf"
 TARGET="/etc/magnum/magnum.conf"
 OWNER="magnum"
 
diff --git a/docker/magnum/magnum-conductor/config-external.sh b/docker/magnum/magnum-conductor/config-external.sh
index b96e3179e..fecdf2e38 100644
--- a/docker/magnum/magnum-conductor/config-external.sh
+++ b/docker/magnum/magnum-conductor/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/magnum/magnum-conductor/magnum.conf"
+SOURCE="/var/lib/kolla/magnum/magnum-conductor/magnum.conf"
 TARGET="/etc/magnum/magnum.conf"
 OWNER="magnum"
 
diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2
index 2967222f4..024a6d2f8 100644
--- a/docker/neutron/neutron-agents/Dockerfile.j2
+++ b/docker/neutron/neutron-agents/Dockerfile.j2
@@ -28,10 +28,10 @@ COPY supervisord.conf /etc/supervisor/
 # main neutron.conf if we wish
 COPY fwaas_driver.ini /etc/neutron/
 
-COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent
-COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent
-COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent
-COPY config-sudoers.sh /opt/kolla/
+COPY neutron-dhcp-agent/ /var/lib/kolla/neutron-dhcp-agent
+COPY neutron-l3-agent/ /var/lib/kolla/neutron-l3-agent
+COPY neutron-metadata-agent/ /var/lib/kolla/neutron-metadata-agent
+COPY config-sudoers.sh /var/lib/kolla/
 
 COPY start.sh /
 
diff --git a/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh
index 96ecd80e6..474b6a0b4 100755
--- a/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh
+++ b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 # Loading common functions.
-source /opt/kolla/config-sudoers.sh
+source /var/lib/kolla/config-sudoers.sh
 
 # Will be removed when neutron-agents is a thin container
 CMD="/usr/bin/neutron-dhcp-agent"
diff --git a/docker/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh
index aa73b090b..0ba99d1fd 100755
--- a/docker/neutron/neutron-agents/neutron-l3-agent/start.sh
+++ b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 # Loading common functions.
-source /opt/kolla/config-sudoers.sh
+source /var/lib/kolla/config-sudoers.sh
 
 # Will be removed when this container is broken out into thin containers
 CMD="/usr/bin/neutron-l3-agent"
diff --git a/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh
index d94f767e2..8a0b5e938 100755
--- a/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh
+++ b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 # Loading common functions.
-source /opt/kolla/config-sudoers.sh
+source /var/lib/kolla/config-sudoers.sh
 
 # Will be removed when this container is broken out in thin containers
 CMD="/usr/bin/neutron-metadata-agent"
diff --git a/docker/neutron/neutron-agents/start.sh b/docker/neutron/neutron-agents/start.sh
index baf3d2a8e..e15650659 100755
--- a/docker/neutron/neutron-agents/start.sh
+++ b/docker/neutron/neutron-agents/start.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit
 
-# Processing /opt/kolla/config_files/config.json
-python /opt/kolla/set_configs.py
+# Processing /var/lib/kolla/config_files/config.json
+python /usr/local/bin/kolla_set_configs
 
 exec /usr/bin/supervisord
diff --git a/docker/neutron/neutron-agents/supervisord.conf b/docker/neutron/neutron-agents/supervisord.conf
index 5cab8f5dc..b7a808b3a 100644
--- a/docker/neutron/neutron-agents/supervisord.conf
+++ b/docker/neutron/neutron-agents/supervisord.conf
@@ -19,21 +19,21 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 serverurl = unix:///var/run/supervisor.sock
 
 [program:neutron-dhcp-agent]
-command=/opt/kolla/neutron-dhcp-agent/start.sh
+command=/var/lib/kolla/neutron-dhcp-agent/start.sh
 priority=40
 startsec=10
 stderr_events_enabled=true
 stdout_events_enabled=true
 
 [program:neutron-metadata-agent]
-command=/opt/kolla/neutron-metadata-agent/start.sh
+command=/var/lib/kolla/neutron-metadata-agent/start.sh
 priority=40
 startsec=10
 stderr_events_enabled=true
 stdout_events_enabled=true
 
 [program:neutron-l3-agent]
-command=/opt/kolla/neutron-l3-agent/start.sh
+command=/var/lib/kolla/neutron-l3-agent/start.sh
 priority=40
 startsec=10
 stderr_events_enabled=true
diff --git a/docker/neutron/neutron-base/ip_wrapper.py b/docker/neutron/neutron-base/ip_wrapper.py
index 871c615ab..33177d03e 100644
--- a/docker/neutron/neutron-base/ip_wrapper.py
+++ b/docker/neutron/neutron-base/ip_wrapper.py
@@ -35,7 +35,7 @@ def host_mnt_exec(cmd):
                 nsenter.Namespace(
                     '1',
                     'mnt',
-                    proc='/opt/kolla/host_proc/'))
+                    proc='/var/lib/kolla/host_proc/'))
             process_ = subprocess.Popen(cmd)
 
     except Exception as e:
@@ -57,9 +57,9 @@ if len(sys.argv) > 2:
         cmd = ["/usr/bin/env", "ip"] + sys.argv[1:]
         sys.exit(host_mnt_exec(cmd).returncode)
     else:
-        cmd = ["/opt/kolla/ip"] + sys.argv[1:]
+        cmd = ["/var/lib/kolla/ip"] + sys.argv[1:]
 else:
-    cmd = ["/opt/kolla/ip"]
+    cmd = ["/var/lib/kolla/ip"]
 
     if len(sys.argv) == 2:
         cmd = cmd + sys.argv[1:]
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index bdb15a340..23fc8bde5 100644
--- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -1,9 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ovs_ensure_configured.sh /opt/kolla/
-
+COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start /opt/kolla/ovs_ensure_configured.sh
+RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ensure_openvswitch_configured
 
 {{ include_footer }}
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 8a9747d2a..192e9821c 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -20,5 +20,6 @@ RUN ln -s swift-base-source/* swift \
 
 {% endif %}
 
-COPY config-swift.sh build-swift-ring.py /opt/kolla/
+COPY config-swift.sh /usr/local/bin/kolla_config_swift
+COPY build-swift-ring.py /usr/local/bin/kolla_build_swift_ring
 RUN mkdir /opt/swift
diff --git a/docker/swift/swift-proxy-server/extend_start.sh b/docker/swift/swift-proxy-server/extend_start.sh
index 78afd2e99..8fce9c154 100644
--- a/docker/swift/swift-proxy-server/extend_start.sh
+++ b/docker/swift/swift-proxy-server/extend_start.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-source /opt/kolla/config-swift.sh
+source /usr/local/bin/kolla_config_swift
diff --git a/docker/zaqar/config-external.sh b/docker/zaqar/config-external.sh
index 7ed6da2eb..e02d34291 100644
--- a/docker/zaqar/config-external.sh
+++ b/docker/zaqar/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/zaqar/zaqar.conf"
+SOURCE="/var/lib/kolla/zaqar/zaqar.conf"
 TARGET="/etc/zaqar/zaqar.conf"
 OWNER="zaqar"