Remove config-internal for gnocchi
Change-Id: Icf74913d03a780cd7c59fbc26a55344f2a12fdfa Partially-implements: blueprint remove-config-internal
This commit is contained in:
Sam Yaple
parent
a5e907a8e9
commit
65ed3c7f53
@ -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"]
|
||||
|
||||
@ -1 +0,0 @@
|
||||
../../../../common/gnocchi/gnocchi-api/config-internal.sh
|
||||
@ -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
|
||||
|
||||
@ -1 +0,0 @@
|
||||
../../../../common/gnocchi/gnocchi-base/config-gnocchi.sh
|
||||
@ -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"]
|
||||
|
||||
@ -1 +0,0 @@
|
||||
../../../../common/gnocchi/gnocchi-statsd/config-internal.sh
|
||||
@ -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"]
|
||||
|
||||
@ -1 +0,0 @@
|
||||
../../../../common/gnocchi/gnocchi-api/config-internal.sh
|
||||
@ -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"]
|
||||
|
||||
@ -1 +0,0 @@
|
||||
../../../../common/gnocchi/gnocchi-base/config-gnocchi.sh
|
||||
@ -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"]
|
||||
|
||||
@ -1 +0,0 @@
|
||||
../../../../common/gnocchi/gnocchi-statsd/config-internal.sh
|
||||
0
docker/common/gnocchi/gnocchi-api/config-external.sh
Executable file → Normal file
0
docker/common/gnocchi/gnocchi-api/config-external.sh
Executable file → Normal file
@ -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
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
0
docker/common/gnocchi/gnocchi-statsd/config-external.sh
Executable file → Normal file
0
docker/common/gnocchi/gnocchi-statsd/config-external.sh
Executable file → Normal file
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
. /opt/kolla/kolla-common.sh
|
||||
. /opt/kolla/config-gnocchi.sh
|
||||
|
||||
exec /usr/bin/gnocchi-statsd
|
||||
@ -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
|
||||
|
||||
@ -231,31 +231,11 @@ In order for each service to function, there is a minimum set of required variab
|
||||
|
||||
# Gnocchi-api
|
||||
|
||||
ADMIN_TENANT_NAME
|
||||
GNOCCHI_ADMIN_PASSWORD
|
||||
GNOCCHI_API_SERVICE_HOST
|
||||
GNOCCHI_ARCHIVE_POLICY
|
||||
GNOCCHI_DB_NAME
|
||||
GNOCCHI_DB_PASSWORD
|
||||
GNOCCHI_DB_USER
|
||||
GNOCCHI_KEYSTONE_USER
|
||||
GNOCCHI_SERVICE_PORT
|
||||
GNOCCHI_SERVICE_PROTOCOL
|
||||
GNOCCHI_STORAGE_BACKEND
|
||||
KEYSTONE_ADMIN_SERVICE_HOST
|
||||
KEYSTONE_ADMIN_SERVICE_PORT
|
||||
KEYSTONE_ADMIN_TOKEN
|
||||
KEYSTONE_AUTH_PROTOCOL
|
||||
None
|
||||
|
||||
# Gnocchi-base
|
||||
|
||||
GNOCCHI_DATA_DIR
|
||||
GNOCCHI_SERVICE_PORT
|
||||
GNOCCHI_STORAGE_BACKEND
|
||||
KEYSTONE_ADMIN_SERVICE_HOST
|
||||
KEYSTONE_ADMIN_SERVICE_PORT
|
||||
KEYSTONE_ADMIN_TOKEN
|
||||
KEYSTONE_PUBLIC_SERVICE_HOST
|
||||
None
|
||||
|
||||
# Gnocchi-statsd
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user