From ee538d1e7c1a92cb8412713e03cdfbcdacad7fab Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 14 Aug 2017 17:09:37 -0400 Subject: [PATCH] Remove ensure logs check in upgrade scripts This commit removes the ensure_logs_exist call in all the upgrade scripts. This function currently only works in a non-systemd world. Now that all the logs go in the journal we can't check for separate log files anymore. In the future we'll modifiy the function to handle systemd and the journal properly, but for right now this is to unblock things. Change-Id: Iedf824a1772115e0dff287a898636f8e58471269 --- projects/30_swift/upgrade.sh | 1 - projects/40_glance/upgrade.sh | 1 - projects/50_neutron/upgrade.sh | 1 - projects/60_nova/upgrade.sh | 1 - projects/70_cinder/upgrade.sh | 2 -- 5 files changed, 6 deletions(-) diff --git a/projects/30_swift/upgrade.sh b/projects/30_swift/upgrade.sh index ef6ab448..629037c5 100755 --- a/projects/30_swift/upgrade.sh +++ b/projects/30_swift/upgrade.sh @@ -77,7 +77,6 @@ start_swift # Don't succeed unless the services come up ensure_services_started swift-object-server swift-proxy-server -ensure_logs_exist s-proxy set +o xtrace diff --git a/projects/40_glance/upgrade.sh b/projects/40_glance/upgrade.sh index cff81927..1b6f6822 100755 --- a/projects/40_glance/upgrade.sh +++ b/projects/40_glance/upgrade.sh @@ -63,7 +63,6 @@ start_glance # Don't succeed unless the services come up ensure_services_started glance-api -ensure_logs_exist g-api g-reg set +o xtrace echo "*********************************************************************" diff --git a/projects/50_neutron/upgrade.sh b/projects/50_neutron/upgrade.sh index 78c9ac22..bf7a23bb 100755 --- a/projects/50_neutron/upgrade.sh +++ b/projects/50_neutron/upgrade.sh @@ -142,7 +142,6 @@ start_neutron_agents # Don't succeed unless the services come up # TODO: service names ensure_services_started -ensure_logs_exist q-svc set +o xtrace echo "*********************************************************************" diff --git a/projects/60_nova/upgrade.sh b/projects/60_nova/upgrade.sh index 0f85f442..c1f8b225 100755 --- a/projects/60_nova/upgrade.sh +++ b/projects/60_nova/upgrade.sh @@ -133,7 +133,6 @@ if ! is_service_enabled ironic; then expected_runnning_services+=' nova-compute' fi ensure_services_started $expected_runnning_services -ensure_logs_exist n-api n-cond n-cpu if [[ "$FORCE_ONLINE_MIGRATIONS" == "True" ]]; then # Run "online" migrations after we've got all the services running diff --git a/projects/70_cinder/upgrade.sh b/projects/70_cinder/upgrade.sh index 0c004a22..132991f9 100755 --- a/projects/70_cinder/upgrade.sh +++ b/projects/70_cinder/upgrade.sh @@ -63,10 +63,8 @@ start_cinder # Don't succeed unless the services come up ensure_services_started cinder-api -ensure_logs_exist c-api if is_service_enabled c-vol; then ensure_services_started cinder-volume - ensure_logs_exist c-vol fi set +o xtrace