diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-01 07:43:18 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-06 03:30:53 +0000 |
| commit | 94162bd08f40ec742a7bfcdcd4aac45be5bd5618 (patch) | |
| tree | 4a0027d671f3e14449663c29d6c95dc0dbe0cee0 /docker/designate | |
| parent | cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c (diff) | |
| download | kolla-94162bd08f40ec742a7bfcdcd4aac45be5bd5618.tar.gz kolla-94162bd08f40ec742a7bfcdcd4aac45be5bd5618.zip | |
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
Diffstat (limited to 'docker/designate')
7 files changed, 8 insertions, 7 deletions
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" |