Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Make sure that after toggling ssl on/off all services are restarted #3365

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −19
Open

Revert "Make sure that after toggling ssl on/off all services are restarted #3365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions scripts/qa_crowbarsetup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2911,10 +2911,6 @@ function custom_configuration
# set discovery root password too
proposal_set_value provisioner default "['attributes']['provisioner']['discovery']['append']" "\"DISCOVERY_ROOT_PASSWORD=$want_rootpw\""

# increase chef intervals to 6h to ensure they
# don't randomly hit us during tempest run
proposal_set_value provisioner default "['attributes']['provisioner']['chef_client_runs']" $((6*60*60))

if [[ $keep_existing_hostname = 1 ]] ; then
proposal_set_value provisioner default "['attributes']['provisioner']['keep_existing_hostname']" "true"
fi
Expand Down Expand Up @@ -4052,14 +4048,6 @@ function oncontroller_check_crm_failcounts
return 0
}

function oncontroller_set_maintenancemode
{
local mode=$1

crm configure property maintenance-mode=$mode
return 0
}

function oncontroller_mount_localreposdir
{
# use the local cache if available. This is done by mounting the local
Expand Down Expand Up @@ -4732,15 +4720,8 @@ function onadmin_testsetup
keystoneret=0

if iscloudver 7plus && [[ $cloudsource =~ 'develcloud' ]] ; then
[[ $hacloud = 1 ]] && oncontroller set_maintenancemode true
test_keystone_toggle_ssl
keystoneret=$?

# Make sure everything is in sync before continuing
crowbar_proposal_commit provisioner

# Now turn maintenance back on
[[ $hacloud = 1 ]] && oncontroller set_maintenancemode false
fi

oncontroller testsetup
Expand Down