Merge "Change type of dns_list and ntp_list to text_list (noop-fixtures)"
This commit is contained in:
commit
53f921d5e7
|
@ -43,7 +43,9 @@ debug: false
|
|||
deployment_id: 38
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -63,7 +65,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 37
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
use_ssl:
|
||||
horizon: true
|
||||
horizon_public: true
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 37
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
use_ssl:
|
||||
horizon: true
|
||||
horizon_public: true
|
||||
|
|
|
@ -250,7 +250,8 @@ nova:
|
|||
master_ip: 10.122.10.2
|
||||
priority: 200
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
metadata:
|
||||
weight: 90
|
||||
label: Host OS DNS Servers
|
||||
|
@ -748,7 +749,10 @@ cinder:
|
|||
fixed_key: 0842c95fc8bc15d2031d1838ebe2059d16cd39248fc5a1bc74638cfe0c5e8687
|
||||
deployment_id: 1
|
||||
external_ntp:
|
||||
ntp_list: 0.fuel.pool.ntp.org, 1.fuel.pool.ntp.org, 2.fuel.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.fuel.pool.ntp.org
|
||||
- 1.fuel.pool.ntp.org
|
||||
- 2.fuel.pool.ntp.org
|
||||
metadata:
|
||||
weight: 100
|
||||
label: Host OS NTP Servers
|
||||
|
|
|
@ -681,7 +681,8 @@ nova:
|
|||
master_ip: 10.122.10.2
|
||||
priority: 100
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
metadata:
|
||||
weight: 90
|
||||
label: Host OS DNS Servers
|
||||
|
@ -1201,7 +1202,10 @@ cinder:
|
|||
fixed_key: 0842c95fc8bc15d2031d1838ebe2059d16cd39248fc5a1bc74638cfe0c5e8687
|
||||
deployment_id: 1
|
||||
external_ntp:
|
||||
ntp_list: 0.fuel.pool.ntp.org, 1.fuel.pool.ntp.org, 2.fuel.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.fuel.pool.ntp.org
|
||||
- 1.fuel.pool.ntp.org
|
||||
- 2.fuel.pool.ntp.org
|
||||
metadata:
|
||||
weight: 100
|
||||
label: Host OS NTP Servers
|
||||
|
|
|
@ -87,7 +87,8 @@ quantum_settings:
|
|||
use_vcenter: false
|
||||
openstack_version: 2016.1.0-9.0
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
metadata:
|
||||
group: general
|
||||
weight: 90
|
||||
|
@ -586,7 +587,10 @@ test_vm_image:
|
|||
public: 'true'
|
||||
management_network_range: 192.168.0.0/24
|
||||
external_ntp:
|
||||
ntp_list: 0.fuel.pool.ntp.org, 1.fuel.pool.ntp.org, 2.fuel.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.fuel.pool.ntp.org
|
||||
- 1.fuel.pool.ntp.org
|
||||
- 2.fuel.pool.ntp.org
|
||||
metadata:
|
||||
group: general
|
||||
weight: 100
|
||||
|
|
|
@ -250,7 +250,8 @@ nova:
|
|||
master_ip: 10.122.5.2
|
||||
priority: 300
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
metadata:
|
||||
weight: 90
|
||||
label: Host OS DNS Servers
|
||||
|
@ -793,7 +794,10 @@ cinder:
|
|||
fixed_key: 264ecf97cf69264f775e549fe5fd1ce3db6a92df94d37745819892803a83b19c
|
||||
deployment_id: 1
|
||||
external_ntp:
|
||||
ntp_list: 0.fuel.pool.ntp.org, 1.fuel.pool.ntp.org, 2.fuel.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.fuel.pool.ntp.org
|
||||
- 1.fuel.pool.ntp.org
|
||||
- 2.fuel.pool.ntp.org
|
||||
metadata:
|
||||
weight: 100
|
||||
label: Host OS NTP Servers
|
||||
|
|
|
@ -250,7 +250,8 @@ nova:
|
|||
master_ip: 10.122.5.2
|
||||
priority: 300
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
metadata:
|
||||
weight: 90
|
||||
label: Host OS DNS Servers
|
||||
|
@ -951,7 +952,10 @@ cinder:
|
|||
fixed_key: 264ecf97cf69264f775e549fe5fd1ce3db6a92df94d37745819892803a83b19c
|
||||
deployment_id: 1
|
||||
external_ntp:
|
||||
ntp_list: 0.fuel.pool.ntp.org, 1.fuel.pool.ntp.org, 2.fuel.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.fuel.pool.ntp.org
|
||||
- 1.fuel.pool.ntp.org
|
||||
- 2.fuel.pool.ntp.org
|
||||
metadata:
|
||||
weight: 100
|
||||
label: Host OS NTP Servers
|
||||
|
|
|
@ -250,7 +250,8 @@ nova:
|
|||
master_ip: 10.122.5.2
|
||||
priority: 300
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
metadata:
|
||||
weight: 90
|
||||
label: Host OS DNS Servers
|
||||
|
@ -791,7 +792,10 @@ cinder:
|
|||
fixed_key: 264ecf97cf69264f775e549fe5fd1ce3db6a92df94d37745819892803a83b19c
|
||||
deployment_id: 1
|
||||
external_ntp:
|
||||
ntp_list: 0.fuel.pool.ntp.org, 1.fuel.pool.ntp.org, 2.fuel.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.fuel.pool.ntp.org
|
||||
- 1.fuel.pool.ntp.org
|
||||
- 2.fuel.pool.ntp.org
|
||||
metadata:
|
||||
weight: 100
|
||||
label: Host OS NTP Servers
|
||||
|
|
|
@ -261,7 +261,8 @@ nova:
|
|||
master_ip: 10.109.37.2
|
||||
priority: 200
|
||||
external_dns:
|
||||
dns_list: 10.109.37.1
|
||||
dns_list:
|
||||
- 10.109.37.1
|
||||
metadata:
|
||||
weight: 90
|
||||
label: Host OS DNS Servers
|
||||
|
@ -706,7 +707,8 @@ cinder:
|
|||
fixed_key: 1d036355c174967c01ddc542cb65e57a6000cfa43a8588e9ae6e30b2ecbb71a9
|
||||
deployment_id: 1
|
||||
external_ntp:
|
||||
ntp_list: 10.109.37.1
|
||||
ntp_list:
|
||||
- 10.109.37.1
|
||||
metadata:
|
||||
weight: 100
|
||||
label: Host OS NTP Servers
|
||||
|
|
|
@ -747,7 +747,8 @@ nova:
|
|||
master_ip: 10.109.37.2
|
||||
priority: 100
|
||||
external_dns:
|
||||
dns_list: 10.109.37.1
|
||||
dns_list:
|
||||
- 10.109.37.1
|
||||
metadata:
|
||||
weight: 90
|
||||
label: Host OS DNS Servers
|
||||
|
@ -1218,7 +1219,8 @@ cinder:
|
|||
fixed_key: 1d036355c174967c01ddc542cb65e57a6000cfa43a8588e9ae6e30b2ecbb71a9
|
||||
deployment_id: 1
|
||||
external_ntp:
|
||||
ntp_list: 10.109.37.1
|
||||
ntp_list:
|
||||
- 10.109.37.1
|
||||
metadata:
|
||||
weight: 100
|
||||
label: Host OS NTP Servers
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 37
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 37
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 37
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 37
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 37
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 38
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 38
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 38
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 38
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
use_ssl:
|
||||
horizon: true
|
||||
horizon_public: true
|
||||
|
|
|
@ -36,7 +36,9 @@ debug: false
|
|||
deployment_id: 38
|
||||
deployment_mode: ha_compact
|
||||
external_dns:
|
||||
dns_list: 8.8.8.8, 8.8.4.4
|
||||
dns_list:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
metadata:
|
||||
label: Upstream DNS
|
||||
weight: 90
|
||||
|
@ -56,7 +58,9 @@ external_ntp:
|
|||
metadata:
|
||||
label: Upstream NTP
|
||||
weight: 100
|
||||
ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
|
||||
ntp_list:
|
||||
- 0.pool.ntp.org
|
||||
- 1.pool.ntp.org
|
||||
public_ssl:
|
||||
metadata:
|
||||
label: Public TLS
|
||||
|
|
Loading…
Reference in New Issue