Browse Source

Merge "Drop use of USE_SYSTEMD var in devstack plugin"

changes/98/707098/1
Zuul 1 week ago
parent
commit
5455399cf0
2 changed files with 5 additions and 50 deletions
  1. +4
    -40
      devstack/lib/kuryr_kubernetes
  2. +1
    -10
      devstack/plugin.sh

+ 4
- 40
devstack/lib/kuryr_kubernetes View File

@@ -786,16 +786,7 @@ function run_openshift_master {

wait_for "etcd" "http://${SERVICE_HOST}:${ETCD_PORT}/v2/machines"

if [[ "$USE_SYSTEMD" = "True" ]]; then
# If systemd is being used, proceed as normal
run_process openshift-master "$cmd" root root
else
# If screen is being used, there is a possibility that the devstack
# environment is on a stable branch. Older versions of run_process have
# a different signature. Sudo is used as a workaround that works in
# both older and newer versions of devstack.
run_process openshift-master "sudo $cmd"
fi
run_process openshift-master "$cmd" root root
}

# make_admin_cluster_admin
@@ -867,16 +858,7 @@ function run_openshift_node {
sudo ln -fs "${CNI_BIN_DIR}" /opt/cni/bin


if [[ "$USE_SYSTEMD" = "True" ]]; then
# If systemd is being used, proceed as normal
run_process openshift-node "$command" root root
else
# If screen is being used, there is a possibility that the devstack
# environment is on a stable branch. Older versions of run_process have
# a different signature. Sudo is used as a workaround that works in
# both older and newer versions of devstack.
run_process openshift-node "sudo $command"
fi
run_process openshift-node "$command" root root
}

# lb_state
@@ -1187,16 +1169,7 @@ EOF

dnsmasq_binary="$(command -v dnsmasq)"
cmd="${dnsmasq_binary} -k -C ${openshift_dnsmasq_conf_path}"
if [[ "$USE_SYSTEMD" = "True" ]]; then
# If systemd is being used, proceed as normal
run_process openshift-dnsmasq "$cmd" root root
else
# If screen is being used, there is a possibility that the devstack
# environment is on a stable branch. Older versions of run_process have
# a different signature. Sudo is used as a workaround that works in
# both older and newer versions of devstack.
run_process openshift-dnsmasq "sudo $cmd"
fi
run_process openshift-dnsmasq "$cmd" root root

sudo cp /etc/resolv.conf /etc/resolv.conf.orig
search_domains=$(awk '/search/ {for (i=2; i<NF; i++) printf $i " "; print $NF}' /etc/resolv.conf.orig)
@@ -1223,16 +1196,7 @@ function run_openshift_dns {
--config=${OPENSHIFT_DATA_DIR}/node/node-config.yaml \
--kubeconfig=${OPENSHIFT_DATA_DIR}/node/node.kubeconfig"

if [[ "$USE_SYSTEMD" = "True" ]]; then
# If systemd is being used, proceed as normal
run_process openshift-dns "$command" root root
else
# If screen is being used, there is a possibility that the devstack
# environment is on a stable branch. Older versions of run_process have
# a different signature. Sudo is used as a workaround that works in
# both older and newer versions of devstack.
run_process openshift-dns "sudo $command"
fi
run_process openshift-dns "$command" root root
}

# cleanup_kuryr_devstack_iptables

+ 1
- 10
devstack/plugin.sh View File

@@ -759,16 +759,7 @@ function run_k8s_kubelet {
fi

wait_for "Kubernetes API Server" "$KURYR_K8S_API_URL"
if [[ "$USE_SYSTEMD" = "True" ]]; then
# If systemd is being used, proceed as normal
run_process kubelet "$command" root root
else
# If screen is being used, there is a possibility that the devstack
# environment is on a stable branch. Older versions of run_process have
# a different signature. Sudo is used as a workaround that works in
# both older and newer versions of devstack.
run_process kubelet "sudo $command"
fi
run_process kubelet "$command" root root
}

function run_coredns {

Loading…
Cancel
Save