Merge "Remove config-internal for gnocchi"

19 files changed, 10 insertions, 105 deletions

diff --git a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile
index cd5974a22..eee474e37 100644
--- a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile
+++ b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile
@@ -6,5 +6,6 @@ RUN yum install -y openstack-gnocchi-api \
     openstack-gnocchi-indexer-sqlalchemy \
     && yum clean all
 
-COPY ./start.sh /start.sh
+COPY start.sh /
+
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/gnocchi/gnocchi-api/config-internal.sh b/docker/centos/binary/gnocchi/gnocchi-api/config-internal.sh
deleted file mode 120000
index 79578ce60..000000000
--- a/docker/centos/binary/gnocchi/gnocchi-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile
index e9d67da7c..30c8fbae3 100644
--- a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile
+++ b/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile
@@ -1,4 +1,2 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY config-gnocchi.sh /opt/kolla/config-gnocchi.sh
diff --git a/docker/centos/binary/gnocchi/gnocchi-base/config-gnocchi.sh b/docker/centos/binary/gnocchi/gnocchi-base/config-gnocchi.sh
deleted file mode 120000
index 75a8a5e10..000000000
--- a/docker/centos/binary/gnocchi/gnocchi-base/config-gnocchi.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-base/config-gnocchi.sh
\ No newline at end of file
diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile
index 7998a3621..354c312d0 100644
--- a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile
+++ b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile
@@ -3,5 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum install -y openstack-gnocchi-statsd && yum clean all
 
-COPY ./start.sh /start.sh
+COPY start.sh /
+
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh
deleted file mode 120000
index 9d9ebfa7d..000000000
--- a/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-statsd/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile
index 5c173f51e..ad16c6e00 100644
--- a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile
+++ b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile
@@ -1,8 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ./start.sh /start.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh b/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh
deleted file mode 120000
index 79578ce60..000000000
--- a/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
index 2be4324ec..3bcc44125 100644
--- a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
+++ b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
@@ -11,7 +11,3 @@ RUN cd /gnocchi \
     && mkdir /etc/gnocchi /var/log/gnocchi \
     && cp -r /gnocchi/etc/* /etc/gnocchi/ \
     && rm -rf /root/.cache
-
-COPY config-gnocchi.sh /opt/kolla/config-gnocchi.sh
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh b/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh
deleted file mode 120000
index 75a8a5e10..000000000
--- a/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-base/config-gnocchi.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile
index 5c173f51e..ad16c6e00 100644
--- a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile
+++ b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile
@@ -1,8 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ./start.sh /start.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh b/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh
deleted file mode 120000
index 9d9ebfa7d..000000000
--- a/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/gnocchi/gnocchi-statsd/config-internal.sh
\ No newline at end of file
diff --git a/docker/common/gnocchi/gnocchi-api/config-external.sh b/docker/common/gnocchi/gnocchi-api/config-external.sh
index 59639ba63..59639ba63 100755..100644
--- a/docker/common/gnocchi/gnocchi-api/config-external.sh
+++ b/docker/common/gnocchi/gnocchi-api/config-external.sh
diff --git a/docker/common/gnocchi/gnocchi-api/config-internal.sh b/docker/common/gnocchi/gnocchi-api/config-internal.sh
deleted file mode 100755
index 411e9ae8a..000000000
--- a/docker/common/gnocchi/gnocchi-api/config-internal.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-gnocchi.sh
-
-check_required_vars KEYSTONE_ADMIN_TOKEN \
-                    KEYSTONE_AUTH_PROTOCOL \
-                    KEYSTONE_ADMIN_SERVICE_HOST \
-                    KEYSTONE_ADMIN_SERVICE_PORT \
-                    ADMIN_TENANT_NAME \
-                    GNOCCHI_DB_NAME \
-                    GNOCCHI_DB_USER \
-                    GNOCCHI_DB_PASSWORD \
-                    GNOCCHI_SERVICE_PROTOCOL \
-                    GNOCCHI_SERVICE_PORT \
-                    GNOCCHI_ARCHIVE_POLICY \
-                    GNOCCHI_STORAGE_BACKEND \
-                    GNOCCHI_KEYSTONE_USER \
-                    GNOCCHI_ADMIN_PASSWORD \
-                    GNOCCHI_API_SERVICE_HOST
-
-fail_unless_os_service_running keystone
-fail_unless_db
-
-mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
-CREATE DATABASE IF NOT EXISTS ${GNOCCHI_DB_NAME} DEFAULT CHARACTER SET utf8;
-GRANT ALL PRIVILEGES ON ${GNOCCHI_DB_NAME}.* TO
-       '${GNOCCHI_DB_USER}'@'%' IDENTIFIED BY '${GNOCCHI_DB_PASSWORD}'
-
-EOF
-
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
-
-
-crux user-create -n ${GNOCCHI_KEYSTONE_USER} \
-    -p ${GNOCCHI_ADMIN_PASSWORD} \
-    -t ${ADMIN_TENANT_NAME} \
-    -r service
-
-crux service-create -n ${GNOCCHI_KEYSTONE_USER} -t "metric" \
-    -d "OpenStack Metric Service"
-
-crux endpoint-create i--remove-all -n ${GNOCCHI_KEYSTONE_USER} -t metric \
-    -I "${GNOCCHI_SERVICE_PROTOCOL}://${GNOCCHI_API_SERVICE_HOST}:${GNOCCHI_SERVICE_PORT}" \
-    -P "${GNOCCHI_SERVICE_PROTOCOL}://${GNOCCHI_API_SERVICE_HOST}:${GNOCCHI_SERVICE_PORT}" \
-    -A "${GNOCCHI_SERVICE_PROTOCOL}://${GNOCCHI_API_SERVICE_HOST}:${GNOCCHI_SERVICE_PORT}"
-
-exec /usr/bin/gnocchi-api
diff --git a/docker/common/gnocchi/gnocchi-api/start.sh b/docker/common/gnocchi/gnocchi-api/start.sh
index 704183ac8..657368a27 100755
--- a/docker/common/gnocchi/gnocchi-api/start.sh
+++ b/docker/common/gnocchi/gnocchi-api/start.sh
@@ -7,7 +7,7 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Config-internal script exec out of this function, it does not return here.
+# Execute config strategy
 set_configs
 
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
diff --git a/docker/common/gnocchi/gnocchi-base/config-gnocchi.sh b/docker/common/gnocchi/gnocchi-base/config-gnocchi.sh
deleted file mode 100755
index fb5f5c55c..000000000
--- a/docker/common/gnocchi/gnocchi-base/config-gnocchi.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-. /opt/kolla/kolla-common.sh
-
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
-                    KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_PUBLIC_SERVICE_HOST \
-                    GNOCCHI_STORAGE_BACKEND GNOCCHI_DATA_DIR GNOCCHI_SERVICE_PORT
-dump_vars
-
-cat > /openrc <<EOF
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
-EOF
-
-
-cfg=/etc/gnocchi/gnocchi.conf
-crudini --set $cfg \
-    storage driver "$GNOCCHI_STORAGE_BACKEND"
-crudini --set $cfg \
-    storage file_basepath "$GNOCCHI_DATA_DIR"
-crudini --set $cfg \
-    indexer url "mysql://$GNOCCHI_DB_USER:$GNOCCHI_DB_PASSWORD@$MARIADB_SERVICE_HOST/$GNOCCHI_DB_NAME?charset=utf8"
diff --git a/docker/common/gnocchi/gnocchi-statsd/config-external.sh b/docker/common/gnocchi/gnocchi-statsd/config-external.sh
index 59639ba63..59639ba63 100755..100644
--- a/docker/common/gnocchi/gnocchi-statsd/config-external.sh
+++ b/docker/common/gnocchi/gnocchi-statsd/config-external.sh
diff --git a/docker/common/gnocchi/gnocchi-statsd/config-internal.sh b/docker/common/gnocchi/gnocchi-statsd/config-internal.sh
deleted file mode 100755
index 81a71da16..000000000
--- a/docker/common/gnocchi/gnocchi-statsd/config-internal.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-gnocchi.sh
-
-exec /usr/bin/gnocchi-statsd
diff --git a/docker/common/gnocchi/gnocchi-statsd/start.sh b/docker/common/gnocchi/gnocchi-statsd/start.sh
index 7e9024f15..636e71323 100755
--- a/docker/common/gnocchi/gnocchi-statsd/start.sh
+++ b/docker/common/gnocchi/gnocchi-statsd/start.sh
@@ -7,7 +7,7 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Config-internal script exec out of this function, it does not return here.
+# Execute config strategy
 set_configs
 
 exec $CMD $ARGS