Skip to content
Snippets Groups Projects
Commit 9970519b authored by Harm Weites's avatar Harm Weites
Browse files

Add config-internal/config-external to Nova-controller containers 

Partially Implements: Blueprint standard-start

Change-Id: I40a863161bee779a944e9388a1ad7d5d0e7adba7
parent 3a4500c1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 122 additions and 41 deletions
docker/centos/binary/nova-controller/nova-api/Dockerfile
+ 2
− 0
View file @ 9970519b
......@@ -7,4 +7,6 @@ RUN yum -y install \
ADD ./start.sh /start.sh
ADD ./check.sh /check.sh
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]
docker/centos/binary/nova-controller/nova-api/config-external.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-api/config-external.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-api/config-internal.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-api/config-internal.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-conductor/Dockerfile
+ 3
− 0
View file @ 9970519b
......@@ -5,4 +5,7 @@ RUN yum -y install \
openstack-nova-conductor && yum clean all
ADD ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]
docker/centos/binary/nova-controller/nova-conductor/config-external.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-conductor/config-external.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-conductor/config-internal.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-conductor/config-internal.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
+ 2
− 0
View file @ 9970519b
......@@ -5,4 +5,6 @@ RUN yum -y install openstack-nova-console && yum clean all
ADD start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]
docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-consoleauth/config-external.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-consoleauth/config-internal.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-consoleauth/config-internal.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
+ 2
− 0
View file @ 9970519b
......@@ -7,4 +7,6 @@ RUN yum -y install \
ADD start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]
docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-novncproxy/config-external.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-novncproxy/config-internal.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-novncproxy/config-internal.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
+ 3
− 0
View file @ 9970519b
......@@ -5,4 +5,7 @@ RUN yum -y install \
openstack-nova-scheduler && yum clean all
ADD ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]
docker/centos/binary/nova-controller/nova-scheduler/config-external.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-scheduler/config-external.sh
\ No newline at end of file
docker/centos/binary/nova-controller/nova-scheduler/config-internal.sh 0 → 120000
+ 1
− 0
View file @ 9970519b
../../../../common/nova-controller/nova-scheduler/config-internal.sh
\ No newline at end of file
docker/common/nova-controller/nova-api/config-external.sh 0 → 100755
+ 10
− 0
View file @ 9970519b
#!/bin/bash
SOURCE="/opt/kolla/nova-api/nova.conf"
TARGET="/etc/nova/nova.conf"
OWNER="nova"
if [[ -f "$SOURCE" ]]; then
cp $SOURCE $TARGET
chown ${OWNER}: $TARGET
chmod 0644 $TARGET
fi
docker/common/nova-controller/nova-api/config-internal.sh 0 → 100755
+ 46
− 0
View file @ 9970519b
#!/bin/bash
set -e
. /opt/kolla/config-nova.sh
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \
ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \
NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME
fail_unless_os_service_running keystone
fail_unless_db $NOVA_DB_NAME
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
cfg=/etc/nova/nova.conf
# configure logging
crudini --set $cfg DEFAULT log_file "${NOVA_API_LOG_FILE}"
crux user-create --update \
-n "${NOVA_KEYSTONE_USER}" \
-p "${NOVA_KEYSTONE_PASSWORD}" \
-t "${ADMIN_TENANT_NAME}" \
-r admin
crux endpoint-create --remove-all \
-n ec2 -t ec2 \
-I "http://${NOVA_EC2_API_SERVICE_HOST}:8773/services/Cloud" \
-P "http://${PUBLIC_IP}:8773/services/Cloud" \
-A "http://${NOVA_EC2_API_SERVICE_HOST}:8773/services/Admin"
crux endpoint-create --remove-all \
-n nova -t compute \
-I "http://${NOVA_API_SERVICE_HOST}:8774/v2/\$(tenant_id)s" \
-P "http://${PUBLIC_IP}:8774/v2/\$(tenant_id)s" \
-A "http://${NOVA_API_SERVICE_HOST}:8774/v2/\$(tenant_id)s"
crux endpoint-create --remove-all \
-n novav3 -t computev3 \
-I "http://${NOVA_API_SERVICE_HOST}:8774/v3" \
-P "http://${PUBLIC_IP}:8774/v3" \
-A "http://${NOVA_API_SERVICE_HOST}:8774/v3"
exec /usr/bin/nova-api --config-file /etc/nova/nova.conf
docker/common/nova-controller/nova-api/start.sh
+ 8
− 41
View file @ 9970519b
#!/bin/bash
set -o errexit
set -e
CMD="/usr/bin/nova-api"
ARGS=""
. /opt/kolla/config-nova.sh
# Loading common functions.
source /opt/kolla/kolla-common.sh
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \
ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \
NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME
fail_unless_os_service_running keystone
fail_unless_db $NOVA_DB_NAME
# Config-internal script exec out of this function, it does not return here.
set_configs
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
cfg=/etc/nova/nova.conf
# configure logging
crudini --set $cfg DEFAULT log_file "${NOVA_API_LOG_FILE}"
crux user-create --update \
-n "${NOVA_KEYSTONE_USER}" \
-p "${NOVA_KEYSTONE_PASSWORD}" \
-t "${ADMIN_TENANT_NAME}" \
-r admin
crux endpoint-create --remove-all \
-n ec2 -t ec2 \
-I "http://${NOVA_EC2_API_SERVICE_HOST}:8773/services/Cloud" \
-P "http://${PUBLIC_IP}:8773/services/Cloud" \
-A "http://${NOVA_EC2_API_SERVICE_HOST}:8773/services/Admin"
crux endpoint-create --remove-all \
-n nova -t compute \
-I "http://${NOVA_API_SERVICE_HOST}:8774/v2/\$(tenant_id)s" \
-P "http://${PUBLIC_IP}:8774/v2/\$(tenant_id)s" \
-A "http://${NOVA_API_SERVICE_HOST}:8774/v2/\$(tenant_id)s"
crux endpoint-create --remove-all \
-n novav3 -t computev3 \
-I "http://${NOVA_API_SERVICE_HOST}:8774/v3" \
-P "http://${PUBLIC_IP}:8774/v3" \
-A "http://${NOVA_API_SERVICE_HOST}:8774/v3"
exec /usr/bin/nova-api --config-file /etc/nova/nova.conf
exec $CMD $ARGS
docker/common/nova-controller/nova-conductor/config-external.sh 0 → 100755
+ 10
− 0
View file @ 9970519b
#!/bin/bash
SOURCE="/opt/kolla/nova-conductor/nova.conf"
TARGET="/etc/nova/nova.conf"
OWNER="nova"
if [[ -f "$SOURCE" ]]; then
cp $SOURCE $TARGET
chown ${OWNER}: $TARGET
chmod 0644 $TARGET
fi
docker/common/nova-controller/nova-conductor/config-internal.sh 0 → 100755
+ 26
− 0
View file @ 9970519b
#!/bin/bash
set -e
. /opt/kolla/config-nova.sh
check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD \
INIT_NOVA_DB
fail_unless_db
cfg=/etc/nova/nova.conf
# configure logging
crudini --set $cfg DEFAULT log_file "${NOVA_CONDUCTOR_LOG_FILE}"
if [ "${INIT_NOVA_DB}" == "true" ]; then
mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME};
GRANT ALL PRIVILEGES ON ${NOVA_DB_NAME}.* TO
'${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}'
EOF
nova-manage db sync
fi
exec /usr/bin/nova-conductor --config-file /etc/nova/nova.conf
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment