Remove etcd_legacy
This commit removes code that implemented deprecated etcd deployment option. In the gates we're using etcd3 from openstack/devstack for a long time now and that should be used by anyone else as well. Closes-Bug: 1799468 Change-Id: I7fa9f79cb2dcb8f16e9329dc2d5928a544c4ca4a
This commit is contained in:
Michał Dulko
parent
0be427f349
commit
2ecf343d30
|
|
@ -156,37 +156,6 @@ function stop_container {
|
|||
stop_process "$name"
|
||||
}
|
||||
|
||||
|
||||
# prepare_etcd_legacy
|
||||
# Description: Creates datadir for etcd and fetches its container image
|
||||
function prepare_etcd_legacy {
|
||||
# Make Etcd data directory
|
||||
sudo install -d -o "$STACK_USER" "$KURYR_ETCD_DATA_DIR"
|
||||
|
||||
# Get Etcd container
|
||||
get_container "$KURYR_ETCD_IMAGE" "$KURYR_ETCD_VERSION"
|
||||
}
|
||||
|
||||
# run_etcd_legacy
|
||||
# Description: Deprecated way of running etcd for Kubernetes (based on
|
||||
# coreos upstream image.
|
||||
function run_etcd_legacy {
|
||||
run_container etcd \
|
||||
--net host \
|
||||
--volume="${KURYR_ETCD_DATA_DIR}:/var/etcd:rw" \
|
||||
"${KURYR_ETCD_IMAGE}:${KURYR_ETCD_VERSION}" \
|
||||
/usr/local/bin/etcd \
|
||||
--name devstack \
|
||||
--data-dir /var/etcd/data \
|
||||
--initial-advertise-peer-urls "$KURYR_ETCD_ADVERTISE_PEER_URL" \
|
||||
--listen-peer-urls "$KURYR_ETCD_LISTEN_PEER_URL" \
|
||||
--listen-client-urls "$KURYR_ETCD_LISTEN_CLIENT_URL" \
|
||||
--advertise-client-urls "$KURYR_ETCD_ADVERTISE_CLIENT_URL" \
|
||||
--initial-cluster-token etcd-cluster-1 \
|
||||
--initial-cluster "devstack=$KURYR_ETCD_ADVERTISE_PEER_URL" \
|
||||
--initial-cluster-state new
|
||||
}
|
||||
|
||||
# _allocation_range
|
||||
# Description: Writes out tab separated usable ip range for a CIDR
|
||||
# Params:
|
||||
|
|
@ -782,7 +751,7 @@ function run_openshift_master {
|
|||
|
||||
# Generate master config
|
||||
"${OPENSHIFT_BIN}/openshift" start master \
|
||||
"--etcd=${KURYR_ETCD_ADVERTISE_CLIENT_URL}" \
|
||||
"--etcd=http://${SERVICE_HOST}:${ETCD_PORT}" \
|
||||
"--network-cidr=${pod_subnet_cidr}" \
|
||||
"--portal-net=${portal_net}" \
|
||||
"--listen=0.0.0.0:${OPENSHIFT_API_PORT}" \
|
||||
|
|
@ -810,7 +779,7 @@ function run_openshift_master {
|
|||
cmd="/usr/local/bin/openshift start master \
|
||||
--config=${OPENSHIFT_DATA_DIR}/master-config.yaml"
|
||||
|
||||
wait_for "etcd" "${KURYR_ETCD_ADVERTISE_CLIENT_URL}/v2/machines"
|
||||
wait_for "etcd" "http://${SERVICE_HOST}:${ETCD_PORT}/v2/machines"
|
||||
|
||||
if [[ "$USE_SYSTEMD" = "True" ]]; then
|
||||
# If systemd is being used, proceed as normal
|
||||
|
|
|
|||
|
|
@ -100,23 +100,6 @@ enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devs
|
|||
# ====
|
||||
# The default is for devstack to run etcd for you.
|
||||
enable_service etcd3
|
||||
|
||||
# You can also run the deprecated etcd containerized and select the image and
|
||||
# version of it by commenting the etcd3 service enablement and uncommenting
|
||||
#
|
||||
# enable legacy_etcd
|
||||
#
|
||||
# You can also modify the following defaults.
|
||||
# KURYR_ETCD_IMAGE="quay.io/coreos/etcd"
|
||||
# KURYR_ETCD_VERSION="v3.0.8"
|
||||
#
|
||||
# You can select the listening and advertising client and peering Etcd
|
||||
# addresses by uncommenting and changing from the following defaults:
|
||||
# KURYR_ETCD_ADVERTISE_CLIENT_URL=http://my_host_ip:2379}
|
||||
# KURYR_ETCD_ADVERTISE_PEER_URL=http://my_host_ip:2380}
|
||||
# KURYR_ETCD_LISTEN_CLIENT_URL=http://0.0.0.0:2379}
|
||||
# KURYR_ETCD_LISTEN_PEER_URL=http://0.0.0.0:2380}
|
||||
#
|
||||
# If you already have an etcd cluster configured and running, you can just
|
||||
# comment out the lines enabling legacy_etcd and etcd3
|
||||
# then uncomment and set the following line:
|
||||
|
|
|
|||
|
|
@ -74,18 +74,6 @@ enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devs
|
|||
|
||||
# Etcd
|
||||
# ====
|
||||
# The default is for devstack to run etcd for you. You can select the image and
|
||||
# version of it by uncommenting and modifying the following defaults.
|
||||
# KURYR_ETCD_IMAGE="quay.io/coreos/etcd"
|
||||
# KURYR_ETCD_VERSION="v3.0.8"
|
||||
#
|
||||
# You can select the listening and advertising client and peering Etcd
|
||||
# addresses by uncommenting and changing from the following defaults:
|
||||
# KURYR_ETCD_ADVERTISE_CLIENT_URL=http://my_host_ip:2379}
|
||||
# KURYR_ETCD_ADVERTISE_PEER_URL=http://my_host_ip:2380}
|
||||
# KURYR_ETCD_LISTEN_CLIENT_URL=http://0.0.0.0:2379}
|
||||
# KURYR_ETCD_LISTEN_PEER_URL=http://0.0.0.0:2380}
|
||||
#
|
||||
# If you already have etcd configured and running, you can just comment out
|
||||
enable_service etcd3
|
||||
# then uncomment and set the following line:
|
||||
|
|
|
|||
|
|
@ -89,23 +89,6 @@ enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devs
|
|||
# ====
|
||||
# The default is for devstack to run etcd for you.
|
||||
enable_service etcd3
|
||||
|
||||
# You can also run the deprecated etcd containerized and select the image and
|
||||
# version of it by commenting the etcd3 service enablement and uncommenting
|
||||
#
|
||||
# enable legacy_etcd
|
||||
#
|
||||
# You can also modify the following defaults.
|
||||
# KURYR_ETCD_IMAGE="quay.io/coreos/etcd"
|
||||
# KURYR_ETCD_VERSION="v3.0.8"
|
||||
#
|
||||
# You can select the listening and advertising client and peering Etcd
|
||||
# addresses by uncommenting and changing from the following defaults:
|
||||
# KURYR_ETCD_ADVERTISE_CLIENT_URL=http://my_host_ip:2379}
|
||||
# KURYR_ETCD_ADVERTISE_PEER_URL=http://my_host_ip:2380}
|
||||
# KURYR_ETCD_LISTEN_CLIENT_URL=http://0.0.0.0:2379}
|
||||
# KURYR_ETCD_LISTEN_PEER_URL=http://0.0.0.0:2380}
|
||||
#
|
||||
# If you already have an etcd cluster configured and running, you can just
|
||||
# comment out the lines enabling legacy_etcd and etcd3
|
||||
# then uncomment and set the following line:
|
||||
|
|
|
|||
|
|
@ -115,23 +115,6 @@ enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devs
|
|||
# ====
|
||||
# The default is for devstack to run etcd for you.
|
||||
enable_service etcd3
|
||||
|
||||
# You can also run the deprecated etcd containerized and select the image and
|
||||
# version of it by commenting the etcd3 service enablement and uncommenting
|
||||
#
|
||||
# enable legacy_etcd
|
||||
#
|
||||
# You can also modify the following defaults.
|
||||
# KURYR_ETCD_IMAGE="quay.io/coreos/etcd"
|
||||
# KURYR_ETCD_VERSION="v3.0.8"
|
||||
#
|
||||
# You can select the listening and advertising client and peering Etcd
|
||||
# addresses by uncommenting and changing from the following defaults:
|
||||
# KURYR_ETCD_ADVERTISE_CLIENT_URL=http://my_host_ip:2379}
|
||||
# KURYR_ETCD_ADVERTISE_PEER_URL=http://my_host_ip:2380}
|
||||
# KURYR_ETCD_LISTEN_CLIENT_URL=http://0.0.0.0:2379}
|
||||
# KURYR_ETCD_LISTEN_PEER_URL=http://0.0.0.0:2380}
|
||||
#
|
||||
# If you already have an etcd cluster configured and running, you can just
|
||||
# comment out the lines enabling legacy_etcd and etcd3
|
||||
# then uncomment and set the following line:
|
||||
|
|
|
|||
|
|
@ -101,23 +101,6 @@ enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devs
|
|||
# ====
|
||||
# The default is for devstack to run etcd for you.
|
||||
enable_service etcd3
|
||||
|
||||
# You can also run the deprecated etcd containerized and select the image and
|
||||
# version of it by commenting the etcd3 service enablement and uncommenting
|
||||
#
|
||||
# enable legacy_etcd
|
||||
#
|
||||
# You can also modify the following defaults.
|
||||
# KURYR_ETCD_IMAGE="quay.io/coreos/etcd"
|
||||
# KURYR_ETCD_VERSION="v3.0.8"
|
||||
#
|
||||
# You can select the listening and advertising client and peering Etcd
|
||||
# addresses by uncommenting and changing from the following defaults:
|
||||
# KURYR_ETCD_ADVERTISE_CLIENT_URL=http://my_host_ip:2379}
|
||||
# KURYR_ETCD_ADVERTISE_PEER_URL=http://my_host_ip:2380}
|
||||
# KURYR_ETCD_LISTEN_CLIENT_URL=http://0.0.0.0:2379}
|
||||
# KURYR_ETCD_LISTEN_PEER_URL=http://0.0.0.0:2380}
|
||||
#
|
||||
# If you already have an etcd cluster configured and running, you can just
|
||||
# comment out the lines enabling legacy_etcd and etcd3
|
||||
# then uncomment and set the following line:
|
||||
|
|
|
|||
|
|
@ -556,7 +556,7 @@ function run_k8s_api {
|
|||
local cluster_ip_range
|
||||
|
||||
# Runs Hyperkube's Kubernetes API Server
|
||||
wait_for "etcd" "${KURYR_ETCD_ADVERTISE_CLIENT_URL}/v2/machines"
|
||||
wait_for "etcd" "http://${SERVICE_HOST}:${ETCD_PORT}/v2/machines"
|
||||
|
||||
service_cidr=$(openstack --os-cloud devstack-admin \
|
||||
--os-region "$REGION_NAME" \
|
||||
|
|
@ -576,7 +576,7 @@ function run_k8s_api {
|
|||
--service-cluster-ip-range="${cluster_ip_range}" \
|
||||
--insecure-bind-address=0.0.0.0 \
|
||||
--insecure-port="${KURYR_K8S_API_PORT}" \
|
||||
--etcd-servers="${KURYR_ETCD_ADVERTISE_CLIENT_URL}" \
|
||||
--etcd-servers="http://${SERVICE_HOST}:${ETCD_PORT}" \
|
||||
--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota \
|
||||
--client-ca-file=/srv/kubernetes/ca.crt \
|
||||
--basic-auth-file=/srv/kubernetes/basic_auth.csv \
|
||||
|
|
@ -851,11 +851,6 @@ if [[ "$1" == "stack" && "$2" == "extra" ]]; then
|
|||
# sure Kuryr can start before neutron-server, so Kuryr start in "extra"
|
||||
# phase. Bug: https://bugs.launchpad.net/kuryr/+bug/1587522
|
||||
|
||||
if is_service_enabled legacy_etcd; then
|
||||
prepare_etcd_legacy
|
||||
run_etcd_legacy
|
||||
fi
|
||||
|
||||
# FIXME(apuimedo): Allow running only openshift node for multinode devstack
|
||||
# We are missing generating a node config so that it does not need to
|
||||
# bootstrap from the master config.
|
||||
|
|
@ -1037,16 +1032,6 @@ if [[ "$1" == "unstack" ]]; then
|
|||
# when doing stack.sh again, openshift-node will use old certificates.
|
||||
sudo rm -rf ${OPENSHIFT_DATA_DIR}
|
||||
fi
|
||||
if is_service_enabled legacy_etcd; then
|
||||
stop_container etcd
|
||||
fi
|
||||
|
||||
cleanup_kuryr_devstack_iptables
|
||||
fi
|
||||
|
||||
if [[ "$1" == "clean" ]]; then
|
||||
if is_service_enabled legacy_etcd; then
|
||||
# Cleanup Etcd for the next stacking
|
||||
sudo rm -rf "$KURYR_ETCD_DATA_DIR"
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -24,13 +24,6 @@ KURYR_NEUTRON_DEFAULT_EXT_SVC_SUBNET=${KURYR_NEUTRON_DEFAULT_EXT_SVC_SUBNET:-pub
|
|||
|
||||
# Etcd
|
||||
ETCD_PORT=${ETCD_PORT:-2379}
|
||||
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:-${DATA_DIR}/etcd}
|
||||
KURYR_ETCD_ADVERTISE_CLIENT_URL=${KURYR_ETCD_ADVERTISE_CLIENT_URL:-http://${HOST_IP}:${ETCD_PORT}}
|
||||
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}
|
||||
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}
|
||||
|
|
|
|||
Loading…
Reference in New Issue