summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2015-11-24 16:45:35 +0100
committerStefan K. Berg <stefan.k.berg@ericsson.com>2015-11-25 10:12:40 +0100
commit7077376d6e0ff0dec77080fa21b75911b811475d (patch)
tree8a07d622d972f6b2c7d5e6bccc5e8f07e43e7a20
parentc3759f82c0c0351e8e21cd69b1d1993dbd2b18fd (diff)
Update of endpoint addresses
As https endpoints introduced in Fuel 7.0 has caused some issues for the automated test setup, this reverts back to the "non https" behavior as in 6.1 for both Horizon and the endpoints, disabling https. This is a *momentary* solution, we need to figure out how to setup the testing infrastructure with secure endpoints enabled! Change-Id: Ida61c2fd0834861b26ab64afec87b2bfbd921e0e Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml4
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml4
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml4
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml4
-rw-r--r--fuel/deploy/templates/virtual_environment/conf/dea.yaml6
5 files changed, 11 insertions, 11 deletions
diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
index fa787a41d..c7d741880 100644
--- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
@@ -673,7 +673,7 @@ settings:
description: Secure access to Horizon enabling HTTPS instead of HTTP
label: HTTPS for Horizon
type: checkbox
- value: true
+ value: false
weight: 10
hostname:
description: Your DNS entries should point to this name. Self-signed certificates
@@ -693,7 +693,7 @@ settings:
description: Enable TLS termination on HAProxy for OpenStack services
label: TLS for OpenStack public endpoints
type: checkbox
- value: true
+ value: false
weight: 20
repo_setup:
metadata:
diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
index 73c75413b..e2d752198 100644
--- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
@@ -670,7 +670,7 @@ settings:
description: Secure access to Horizon enabling HTTPS instead of HTTP
label: HTTPS for Horizon
type: checkbox
- value: true
+ value: false
weight: 10
hostname:
description: Your DNS entries should point to this name. Self-signed certificates
@@ -690,7 +690,7 @@ settings:
description: Enable TLS termination on HAProxy for OpenStack services
label: TLS for OpenStack public endpoints
type: checkbox
- value: true
+ value: false
weight: 20
repo_setup:
metadata:
diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
index c874f8c12..64362793f 100644
--- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
@@ -670,7 +670,7 @@ settings:
description: Secure access to Horizon enabling HTTPS instead of HTTP
label: HTTPS for Horizon
type: checkbox
- value: true
+ value: false
weight: 10
hostname:
description: Your DNS entries should point to this name. Self-signed certificates
@@ -690,7 +690,7 @@ settings:
description: Enable TLS termination on HAProxy for OpenStack services
label: TLS for OpenStack public endpoints
type: checkbox
- value: true
+ value: false
weight: 20
repo_setup:
metadata:
diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
index fe0e34ea9..fa6da9c96 100644
--- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
@@ -670,7 +670,7 @@ settings:
description: Secure access to Horizon enabling HTTPS instead of HTTP
label: HTTPS for Horizon
type: checkbox
- value: true
+ value: false
weight: 10
hostname:
description: Your DNS entries should point to this name. Self-signed certificates
@@ -690,7 +690,7 @@ settings:
description: Enable TLS termination on HAProxy for OpenStack services
label: TLS for OpenStack public endpoints
type: checkbox
- value: true
+ value: false
weight: 20
repo_setup:
metadata:
diff --git a/fuel/deploy/templates/virtual_environment/conf/dea.yaml b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
index 1fa9bb9b0..c764e03e5 100644
--- a/fuel/deploy/templates/virtual_environment/conf/dea.yaml
+++ b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
@@ -373,7 +373,7 @@ settings:
libvirt_type:
label: Hypervisor type
type: radio
- value: qemu
+ value: kvm
values:
- data: kvm
description: Choose this type of hypervisor if you run OpenStack on hardware
@@ -675,7 +675,7 @@ settings:
description: Secure access to Horizon enabling HTTPS instead of HTTP
label: HTTPS for Horizon
type: checkbox
- value: true
+ value: false
weight: 10
hostname:
description: Your DNS entries should point to this name. Self-signed certificates
@@ -695,7 +695,7 @@ settings:
description: Enable TLS termination on HAProxy for OpenStack services
label: TLS for OpenStack public endpoints
type: checkbox
- value: true
+ value: false
weight: 20
repo_setup:
metadata: