From e4259f805b91ce0859e7190f97f8dbf34ee92e45 Mon Sep 17 00:00:00 2001
From: Ross Krumbeck <ross.krumbeck@gmail.com>
Date: Mon, 8 Aug 2016 20:14:43 +1000
Subject: [PATCH] Fix designate bootstrap.

According to
http://docs.openstack.org/developer/designate/getting-started.html#initialize-start-the-central-service
designate database bootstrap to be done by designate-manage database sync.
Was also missing designate-manage pool_manager_cache sync.
designate-manage command is packaged with designate-central.
Boot strap commands moved to designate-central.
Added creation of log directories.
Added python2-oslo-reports and python2-suds for bootstrap to complete.

Change-Id: I3896064b0abb31c96307b16005a340fc193aac3c
Closes-Bug: 1610795
---
 docker/designate/designate-api/Dockerfile.j2       |  3 ---
 docker/designate/designate-api/extend_start.sh     |  8 --------
 docker/designate/designate-base/Dockerfile.j2      | 10 +++++++++-
 docker/designate/designate-base/extend_start.sh    | 10 ++++++++++
 docker/designate/designate-central/Dockerfile.j2   |  4 ++++
 docker/designate/designate-central/extend_start.sh | 14 ++++++++++++++
 6 files changed, 37 insertions(+), 12 deletions(-)
 delete mode 100644 docker/designate/designate-api/extend_start.sh
 create mode 100644 docker/designate/designate-base/extend_start.sh
 create mode 100644 docker/designate/designate-central/extend_start.sh

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index e054395b03..1e45c903c9 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -17,9 +17,6 @@ RUN apt-get -y install --no-install-recommends \
     {% endif %}
 {% endif %}
 
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
 {{ include_footer }}
 
 USER designate
diff --git a/docker/designate/designate-api/extend_start.sh b/docker/designate/designate-api/extend_start.sh
deleted file mode 100644
index 10056778b8..0000000000
--- a/docker/designate/designate-api/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    designate-manage db_sync
-    exit 0
-fi
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index bef8f44270..09cff56f66 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -12,10 +12,13 @@ RUN yum -y install \
         openstack-designate-api \
         openstack-designate-common \
         python-tooz \
+        python2-oslo-reports \
+        python2-suds \
     && yum clean all \
     && cp /etc/designate/policy.json /tmp/ \
     && rpm -e openstack-designate-api \
-    && mv /tmp/policy.json /etc/designate/
+    && mv /tmp/policy.json /etc/designate/ \
+    && chown designate: /etc/designate/policy.json
 
     {% elif base_distro in ['ubuntu'] %}
 
@@ -39,4 +42,9 @@ RUN ln -s designate-base-source/* designate \
 
 {% endif %}
 
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN touch /usr/local/bin/kolla_designate_extend_start \
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_designate_extend_start
+
 RUN usermod -a -G kolla designate
diff --git a/docker/designate/designate-base/extend_start.sh b/docker/designate/designate-base/extend_start.sh
new file mode 100644
index 0000000000..92f091139d
--- /dev/null
+++ b/docker/designate/designate-base/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/designate" ]]; then
+    mkdir -p /var/log/kolla/designate
+fi
+if [[ $(stat -c %a /var/log/kolla/designate) != "755" ]]; then
+    chmod 755 /var/log/kolla/designate
+fi
+
+source /usr/local/bin/kolla_designate_extend_start
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index 01aa6e7817..ab6f60b7e0 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -17,6 +17,10 @@ RUN apt-get -y install --no-install-recommends \
     {% endif %}
 {% endif %}
 
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
+
 {{ include_footer }}
 
 USER designate
diff --git a/docker/designate/designate-central/extend_start.sh b/docker/designate/designate-central/extend_start.sh
new file mode 100644
index 0000000000..50a31c737a
--- /dev/null
+++ b/docker/designate/designate-central/extend_start.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [[ ! -f "/var/log/kolla/designate/designate-manage.log" ]]; then
+    touch /var/log/kolla/designate/designate-manage.log
+    chmod 644 /var/log/kolla/designate/designate-manage.log
+fi
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    designate-manage database sync
+    designate-manage pool-manager-cache sync
+    exit 0
+fi