diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-31 12:41:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-31 12:41:32 +0000 |
| commit | ff05a7541e9ac185d91b46c1cbd04553b1c91e04 (patch) | |
| tree | 8878e8684b6d8ac445491ef8aaef5bd313fcd13b /docker | |
| parent | 6f457e1fcbfc30df887265ad5358dfc5c0200da4 (diff) | |
| parent | 8e2906a59e663d43aaac2369b5b74e5142b61d53 (diff) | |
| download | kolla-ff05a7541e9ac185d91b46c1cbd04553b1c91e04.tar.gz kolla-ff05a7541e9ac185d91b46c1cbd04553b1c91e04.zip | |
Merge "mariadb: make security_reset.expect's timeout configurable"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mariadb/security_reset.expect | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/mariadb/security_reset.expect b/docker/mariadb/security_reset.expect index af71463fb..6d2755e4d 100644 --- a/docker/mariadb/security_reset.expect +++ b/docker/mariadb/security_reset.expect @@ -1,6 +1,6 @@ #!/usr/bin/expect -f -set timeout 10 +if [catch {set timeout $env(DB_MAX_TIMEOUT)}] {set timeout 10} spawn mysql_secure_installation expect { timeout { send_user "\nFailed to get 'Enter current password for root (enter for none):' prompt\n"; exit 1 } |