From 9e62fe1716cb57badb73e3a4c36c8409f1d9143c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 19 Jan 2017 18:35:41 -0500 Subject: [PATCH] multinode: remove 417109 workaround Remove a workaround since 417109 has merged. Change-Id: Iddd9fe5be09c4ed71fca07ad9b9d85fce2e50d14 --- test-environments/multinode-3nodes.yaml | 3 --- test-environments/multinode.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/test-environments/multinode-3nodes.yaml b/test-environments/multinode-3nodes.yaml index 86c9cd90f..1395fdd10 100644 --- a/test-environments/multinode-3nodes.yaml +++ b/test-environments/multinode-3nodes.yaml @@ -7,6 +7,3 @@ parameter_defaults: ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu - # remove it https://review.openstack.org/#/c/417109 is merged. - glance::api::enable_v1_api: false - glance::api::enable_v2_api: true diff --git a/test-environments/multinode.yaml b/test-environments/multinode.yaml index 1eaa3cc5a..b07857a7b 100644 --- a/test-environments/multinode.yaml +++ b/test-environments/multinode.yaml @@ -44,7 +44,4 @@ parameter_defaults: nova::compute::libvirt::libvirt_virt_type: qemu # Required for Centos 7.3 and Qemu 2.6.0 nova::compute::libvirt::libvirt_cpu_mode: 'none' - # remove it https://review.openstack.org/#/c/417109 is merged. - glance::api::enable_v1_api: false - glance::api::enable_v2_api: true SwiftCeilometerPipelineEnabled: False