commit | 867b6182b4fdd06f1e867a028c5c72fc819b9584 | [log] [tgz] |
---|---|---|
author | Tatyanka Leontovich <tleontovich@mirantis.com> | Fri Jun 21 10:34:05 2019 +0000 |
committer | Gerrit Code Review <support@gerrithub.io> | Fri Jun 21 10:34:05 2019 +0000 |
tree | b18b6ce164b1b5c50aab19839ac4485bf3d568f8 | |
parent | 24040018383c3fa9846e4953933f346b828d2aa9 [diff] | |
parent | a463538e0239a9cd2c96adbe962b960a8885e5e8 [diff] |
Merge "Disable encryption"
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml index 6f90af5..2a74470 100644 --- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml +++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -843,7 +843,7 @@ octavia_lb_mgmt_allocation_pool_start: 192.168.1.2 octavia_lb_mgmt_allocation_pool_end: 192.168.1.200 openstack_octavia_enabled: 'True' - secrets_encryption_enabled: 'True' + secrets_encryption_enabled: 'False' secrets_encryption_key_id: 'F5CB2ADC36159B03' # Used on CI only. secrets_encryption_private_key: ''