From 94162bd08f40ec742a7bfcdcd4aac45be5bd5618 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 1 Oct 2015 07:43:18 +0000
Subject: 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
---
 docker/designate/designate-api/config-external.sh           | 2 +-
 docker/designate/designate-backend-bind9/Dockerfile.j2      | 3 ++-
 docker/designate/designate-backend-bind9/config-external.sh | 2 +-
 docker/designate/designate-central/config-external.sh       | 2 +-
 docker/designate/designate-mdns/config-external.sh          | 2 +-
 docker/designate/designate-poolmanager/config-external.sh   | 2 +-
 docker/designate/designate-sink/config-external.sh          | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'docker/designate')

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"
 
-- 
cgit v1.2.3