Remove config-internal for nova

Change-Id: I7dec09e46232f25fd396d1f2f4076f599833f5e5
Partially-implements: blueprint remove-config-internal

3 files changed, 1 insertions, 48 deletions

diff --git a/docker/common/nova/nova-compute/config-internal.sh b/docker/common/nova/nova-compute/config-internal.sh
deleted file mode 100755
index ac7f781f4..000000000
--- a/docker/common/nova/nova-compute/config-internal.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/config-nova-compute.sh
-
-sleep 6
-
-# https://bugs.launchpad.net/kolla/+bug/1461635
-# Cinder requires mounting /dev in the cinder-volume, nova-compute,
-# and libvirt containers.  If /dev/pts/ptmx does not have proper permissions
-# on the host, then libvirt will fail to boot an instance.
-# This is a bug in Docker where it is not correctly mounting /dev/pts
-# Tech Debt tracker: https://bugs.launchpad.net/kolla/+bug/1468962
-# **Temporary fix**
-chmod 666 /dev/pts/ptmx
-
-echo "Starting nova-compute."
-exec /usr/bin/nova-compute --config-file /etc/nova/nova.conf
diff --git a/docker/common/nova/nova-compute/config-nova-compute.sh b/docker/common/nova/nova-compute/config-nova-compute.sh
deleted file mode 100755
index 9a2c12572..000000000
--- a/docker/common/nova/nova-compute/config-nova-compute.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-nova.sh
-
-cfg=/etc/nova/nova.conf
-
-check_required_vars NOVA_VNCSERVER_PROXYCLIENT_ADDRESS NOVA_NOVNC_PROXY_PORT \
-                    NOVA_NOVNC_BASE_ADDRESS
-
-# Configures novnc to listen on all interfaces and instructs nova-compute to
-# announce PROXYCLIENT_IP to the nova-vncproxy. Clients like Horizon will
-# connect with this address.
-# As such, NOVA_VNCSERVER_PROXYCLIENT_ADDRESS is unique per compute node.
-crudini --set $cfg DEFAULT vnc_enabled "True"
-crudini --set $cfg DEFAULT vncserver_listen "0.0.0.0"
-crudini --set $cfg DEFAULT vncserver_proxyclient_address "${NOVA_VNCSERVER_PROXYCLIENT_ADDRESS}"
-crudini --set $cfg DEFAULT novncproxy_base_url "http://${NOVA_NOVNC_BASE_ADDRESS}:${NOVA_NOVNC_PROXY_PORT}/vnc_auto.html"
-
-# configure logging
-crudini --set $cfg DEFAULT log_file "${NOVA_COMPUTE_LOG_FILE}"
-
-# set qmeu emulation if no hardware acceleration found
-if [[ `egrep -c '(vmx|svm)' /proc/cpuinfo` == 0 ]]; then
-    crudini --set $cfg libvirt virt_type qemu
-fi
-
-mkdir -p /var/lib/nova/instances
diff --git a/docker/common/nova/nova-compute/start.sh b/docker/common/nova/nova-compute/start.sh
index c1ca94269..48e77542b 100755
--- a/docker/common/nova/nova-compute/start.sh
+++ b/docker/common/nova/nova-compute/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