Formulas testing revision 2019/10
Related: PROD-32744
Related: PROD-33633
Related: PROD-33634
Related: PROD-33698
Related: PROD-33984
Change-Id: I6cb7f75a7b5249c70386251fb0af35c384c41473
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index 6d38a36..517fcda 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -7,12 +7,14 @@
mount_points:
- path: /mnt/hugepages_1GB
disk_cachemodes: network=writeback,block=none
+ timeout_nbd: 10
heal_instance_info_cache_interval: 60
vncproxy_url: openstack:6080
report_interval: 60
vnc_keymap: en-gb
resume_guests_state_on_host_boot: True
preallocate_images: space
+ instance_build_timeout: 600
cpu_allocation_ratio: 16.0
ram_allocation_ratio: 1.5
disk_allocation_ratio: 1.0
@@ -36,14 +38,14 @@
password: password
tenant: service
logging:
- log_appender: false
+ log_appender: true
log_handlers:
watchedfile:
enabled: true
fluentd:
- enabled: false
+ enabled: true
ossyslog:
- enabled: false
+ enabled: true
message_queue:
engine: rabbitmq
members:
diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls
index 2d00ef3..03de719 100644
--- a/tests/pillar/compute_single.sls
+++ b/tests/pillar/compute_single.sls
@@ -2,6 +2,7 @@
compute:
version: newton
enabled: true
+ timeout_nbd: 10
heal_instance_info_cache_interval: 60
vncproxy_url: openstack:6080
vnc_keymap: en-gb
diff --git a/tests/pillar/compute_single_config_drive_options.sls b/tests/pillar/compute_single_config_drive_options.sls
index b64ea64..ae57794 100644
--- a/tests/pillar/compute_single_config_drive_options.sls
+++ b/tests/pillar/compute_single_config_drive_options.sls
@@ -2,6 +2,7 @@
compute:
version: queens
enabled: true
+ timeout_nbd: 10
heal_instance_info_cache_interval: 60
vncproxy_url: openstack:6080
vnc_keymap: en-gb
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 6abc08f..16a9cc2 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -12,6 +12,8 @@
ram_allocation_ratio: 1.5
disk_allocation_ratio: 1.0
workers: 8
+ instance_build_timeout: 600
+ secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
bind:
private_address: 127.0.0.1
public_address: 127.0.0.1
@@ -51,14 +53,14 @@
password: pswd
logging:
- log_appender: false
+ log_appender: true
log_handlers:
watchedfile:
enabled: true
fluentd:
- enabled: false
+ enabled: true
ossyslog:
- enabled: false
+ enabled: true
message_queue:
engine: rabbitmq
members:
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index f6b51cb..42300f4 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -3,6 +3,8 @@
enabled: true
networking: contrail
version: queens
+ timeout_nbd: 10
+ heal_instance_info_cache_interval: 60
security_group: false
vncproxy_url: 127.0.0.1
vnc_keymap: en-gb
@@ -24,6 +26,7 @@
disk_allocation_ratio: 1.0
workers: 8
nfs_mount_options: 'vers=3,lookupcache=pos'
+ secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
bind:
private_address: 127.0.0.1
public_address: 127.0.0.1
diff --git a/tests/pillar/repo_mcp_openstack_mitaka.sls b/tests/pillar/repo_mcp_openstack_mitaka.sls
deleted file mode 100644
index ea24305..0000000
--- a/tests/pillar/repo_mcp_openstack_mitaka.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka'
- priority: 1050
- package: '*'
- mirantis_openstack_hotfix:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-hotfix main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka-hotfix'
- priority: 1050
- package: '*'
- mirantis_openstack_security:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-security main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka-security'
- priority: 1050
- package: '*'
- mirantis_openstack_updates:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-updates main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka-uptades'
- priority: 1050
- package: '*'
- mirantis_openstack_holdback:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-holdback main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka-holdback'
- priority: 1050
- package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_newton.sls b/tests/pillar/repo_mcp_openstack_newton.sls
deleted file mode 100644
index 9504235..0000000
--- a/tests/pillar/repo_mcp_openstack_newton.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton'
- priority: 1050
- package: '*'
- mirantis_openstack_hotfix:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-hotfix main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton-hotfix'
- priority: 1050
- package: '*'
- mirantis_openstack_security:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-security main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton-security'
- priority: 1050
- package: '*'
- mirantis_openstack_updates:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-updates main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton-uptades'
- priority: 1050
- package: '*'
- mirantis_openstack_holdback:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-holdback main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton-holdback'
- priority: 1050
- package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_ocata.sls b/tests/pillar/repo_mcp_openstack_ocata.sls
deleted file mode 100644
index e601208..0000000
--- a/tests/pillar/repo_mcp_openstack_ocata.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata'
- priority: 1050
- package: '*'
- mirantis_openstack_hotfix:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-hotfix main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata-hotfix'
- priority: 1050
- package: '*'
- mirantis_openstack_security:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-security main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata-security'
- priority: 1050
- package: '*'
- mirantis_openstack_updates:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-updates main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata-uptades'
- priority: 1050
- package: '*'
- mirantis_openstack_holdback:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-holdback main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
- pin:
- - pin: 'release a=ocata-holdback'
- priority: 1050
- package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_pike.sls b/tests/pillar/repo_mcp_openstack_pike.sls
index 789b907..fe6af3c 100644
--- a/tests/pillar/repo_mcp_openstack_pike.sls
+++ b/tests/pillar/repo_mcp_openstack_pike.sls
@@ -3,10 +3,10 @@
enabled: true
repo:
mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }} pike main"
+ source: "deb http://mirror.mirantis.com/update/2019.2.0/openstack-pike/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }}/archive-mcppike.key"
+ key_url: "http://mirror.mirantis.com/update/2019.2.0/openstack-pike/{{ grains.get('oscodename') }}/archive-pike.key"
pin:
- - pin: 'release a=pike'
+ - pin: 'release l=pike'
priority: 1050
package: '*'
\ No newline at end of file
diff --git a/tests/pillar/repo_mcp_openstack_queens.sls b/tests/pillar/repo_mcp_openstack_queens.sls
index 65fb320..ebe1964 100644
--- a/tests/pillar/repo_mcp_openstack_queens.sls
+++ b/tests/pillar/repo_mcp_openstack_queens.sls
@@ -3,10 +3,10 @@
enabled: true
repo:
mirantis_openstack_repo:
- source: "deb http://mirror.mirantis.com/nightly/openstack-queens/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+ source: "deb http://mirror.mirantis.com/update/2019.2.0/openstack-queens/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
architectures: amd64
- key_url: "http://mirror.mirantis.com/nightly/openstack-queens/{{ grains.get('oscodename') }}/archive-queens.key"
+ key_url: "http://mirror.mirantis.com/update/2019.2.0/openstack-queens/{{ grains.get('oscodename') }}/archive-queens.key"
pin:
- pin: 'release l=queens'
priority: 1050
- package: '*'
+ package: '*'
\ No newline at end of file