From b09403b98ef444eb564703b40b6c235a714ccdf9 Mon Sep 17 00:00:00 2001 From: Antoni Segura Puimedon Date: Tue, 7 Mar 2017 23:40:08 +0100 Subject: [PATCH] devstack: Use stackrc DATA_DIR by default Most components store data by default on the stackrc defined variable DATA_DIR. This makes it somewhat expected for devstack users to find the component data. As such, it is good for consistency that we move to use that as default. Change-Id: Icdfcdcf7bb505bcf0607bd718a984821988a2133 Signed-off-by: Antoni Segura Puimedon --- devstack/settings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/settings b/devstack/settings index 63610a63e..595552adb 100644 --- a/devstack/settings +++ b/devstack/settings @@ -20,7 +20,7 @@ KURYR_NEUTRON_DEFAULT_SERVICE_SUBNET=k8s-service-subnet # Etcd KURYR_ETCD_IMAGE=${KURYR_ETCD_IMAGE:-quay.io/coreos/etcd} KURYR_ETCD_VERSION=${KURYR_ETCD_VERSION:-v3.0.8} -KURYR_ETCD_DATA_DIR=${KURYR_ETCD_DATA_DIR:-/var/lib/etcd} +KURYR_ETCD_DATA_DIR=${KURYR_ETCD_DATA_DIR:-${DATA_DIR}/etcd} KURYR_ETCD_ADVERTISE_CLIENT_URL=${KURYR_ETCD_ADVERTISE_CLIENT_URL:-http://${HOST_IP}:2379} KURYR_ETCD_ADVERTISE_PEER_URL=${KURYR_ETCD_ADVERTISE_PEER_URL:-http://${HOST_IP}:2380} KURYR_ETCD_LISTEN_CLIENT_URL=${KURYR_ETCD_LISTEN_CLIENT_URL:-http://0.0.0.0:2379} @@ -29,7 +29,7 @@ KURYR_ETCD_LISTEN_PEER_URL=${KURYR_ETCD_LISTEN_PEER_URL:-http://0.0.0.0:2380} # HYPERKUBE KURYR_HYPERKUBE_IMAGE=${KURYR_HYPERKUBE_IMAGE:-gcr.io/google_containers/hyperkube-amd64} KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.4.6} -KURYR_HYPERKUBE_DATA_DIR=${KURYR_HYPERKUBE_DATA_DIR:-/var/lib/hyperkube} +KURYR_HYPERKUBE_DATA_DIR=${KURYR_HYPERKUBE_DATA_DIR:-${DATA_DIR}/hyperkube} KURYR_HYPERKUBE_BINARY=${KURYR_HYPERKUBE_BINARY:-/usr/local/bin/hyperkube} # Kubernetes