Update queens models and context
Change-Id: I1f60df6258e965d79a3e76262ffa055114d97e7f
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
index 2abc4e7..d5c79af 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
@@ -1,4 +1,7 @@
default_context:
+ barbican_backend: dogtag
+ barbican_enabled: 'False'
+ auditd_enabled: 'False'
bmk_enabled: 'False'
ceph_enabled: 'False'
cicd_enabled: 'False'
@@ -52,6 +55,10 @@
openstack_compute_rack01_hostname: cmp
openstack_compute_rack01_single_subnet: 172.16.10
openstack_compute_rack01_tenant_subnet: 10.1.0
+ openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.150
+ openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.150
+ openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.150
+ openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.150
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
@@ -101,6 +108,11 @@
openstack_proxy_node02_address: 172.16.10.122
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: 172.16.10.19
+ openstack_dns_hostname: dns
+ openstack_dns_node01_address: 172.16.10.111
+ openstack_dns_node01_hostname: dns01
+ openstack_dns_node02_address: 172.16.10.112
+ openstack_dns_node02_hostname: dns02
openstack_version: queens
oss_enabled: 'False'
oss_node03_address: ${_param:stacklight_monitor_node03_address}
@@ -183,4 +195,13 @@
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'False'
rsync_fernet_rotation: 'True'
- compute_padding_with_zeros: False
\ No newline at end of file
+ compute_padding_with_zeros: False
+ designate_backend: bind
+ designate_enabled: 'False'
+ nova_vnc_tls_enabled: 'False'
+ galera_ssl_enabled: 'False'
+ openstack_mysql_x509_enabled: 'False'
+ rabbitmq_ssl_enabled: 'False'
+ openstack_rabbitmq_x509_enabled: 'False'
+ tenant_telemetry_enabled: 'False'
+ gnocchi_aggregation_storage: file
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
index 0f806cf..5652b84 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
@@ -1,5 +1,5 @@
nodes:
- cfg01.mcp11-ovs-dpdk.local:
+ cfg01.mcp-queens-dvr.local:
reclass_storage_name: infra_config_node01
roles:
- infra_config
@@ -10,16 +10,13 @@
ens4:
role: single_ctl
- ctl01.mcp11-ovs-dpdk.local:
+ ctl01.mcp-queens-dvr.local:
reclass_storage_name: openstack_control_node01
roles:
- infra_kvm
- openstack_control_leader
- openstack_database_leader
- openstack_message_queue
-# - features_designate_pool_manager_database
-# - features_designate_pool_manager
-# - features_designate_pool_manager_keystone
- linux_system_codename_xenial
interfaces:
ens3:
@@ -27,15 +24,13 @@
ens4:
role: single_ctl
- ctl02.mcp11-ovs-dpdk.local:
+ ctl02.mcp-queens-dvr.local:
reclass_storage_name: openstack_control_node02
roles:
- infra_kvm
- openstack_control
- openstack_database
- openstack_message_queue
-# - features_designate_pool_manager_database
-# - features_designate_pool_manager
- linux_system_codename_xenial
interfaces:
ens3:
@@ -43,15 +38,13 @@
ens4:
role: single_ctl
- ctl03.mcp11-ovs-dpdk.local:
+ ctl03.mcp-queens-dvr.local:
reclass_storage_name: openstack_control_node03
roles:
- infra_kvm
- openstack_control
- openstack_database
- openstack_message_queue
-# - features_designate_pool_manager_database
-# - features_designate_pool_manager
- linux_system_codename_xenial
interfaces:
ens3:
@@ -59,11 +52,10 @@
ens4:
role: single_ctl
- prx01.mcp11-ovs-dpdk.local:
+ prx01.mcp-queens-dvr.local:
reclass_storage_name: openstack_proxy_node01
roles:
- openstack_proxy
-# - features_designate_pool_manager_proxy
- linux_system_codename_xenial
interfaces:
ens3:
@@ -71,7 +63,7 @@
ens4:
role: single_ctl
- mon01.mcp11-ovs-dpdk.local:
+ mon01.mcp-queens-dvr.local:
reclass_storage_name: stacklight_server_node01
roles:
- stacklightv2_server_leader
@@ -82,7 +74,7 @@
ens4:
role: single_ctl
- mon02.mcp11-ovs-dpdk.local:
+ mon02.mcp-queens-dvr.local:
reclass_storage_name: stacklight_server_node02
roles:
- stacklightv2_server
@@ -93,7 +85,7 @@
ens4:
role: single_ctl
- mon03.mcp11-ovs-dpdk.local:
+ mon03.mcp-queens-dvr.local:
reclass_storage_name: stacklight_server_node03
roles:
- stacklightv2_server
@@ -104,7 +96,7 @@
ens4:
role: single_ctl
- log01.mcp11-ovs-dpdk.local:
+ log01.mcp-queens-dvr.local:
reclass_storage_name: stacklight_log_node01
roles:
- stacklight_log_leader_v2
@@ -115,7 +107,7 @@
ens4:
role: single_ctl
- log02.mcp11-ovs-dpdk.local:
+ log02.mcp-queens-dvr.local:
reclass_storage_name: stacklight_log_node02
roles:
- stacklight_log
@@ -126,7 +118,7 @@
ens4:
role: single_ctl
- log03.mcp11-ovs-dpdk.local:
+ log03.mcp-queens-dvr.local:
reclass_storage_name: stacklight_log_node03
roles:
- stacklight_log
@@ -137,7 +129,7 @@
ens4:
role: single_ctl
- mtr01.mcp11-ovs-dpdk.local:
+ mtr01.mcp-queens-dvr.local:
reclass_storage_name: stacklight_telemetry_node01
roles:
- stacklight_telemetry_leader
@@ -148,7 +140,7 @@
ens4:
role: single_ctl
- mtr02.mcp11-ovs-dpdk.local:
+ mtr02.mcp-queens-dvr.local:
reclass_storage_name: stacklight_telemetry_node02
roles:
- stacklight_telemetry
@@ -159,7 +151,7 @@
ens4:
role: single_ctl
- mtr03.mcp11-ovs-dpdk.local:
+ mtr03.mcp-queens-dvr.local:
reclass_storage_name: stacklight_telemetry_node03
roles:
- stacklight_telemetry
@@ -171,7 +163,7 @@
role: single_ctl
# Generator-based computes. For compatibility only
- cmp<<count>>.mcp11-ovs-dpdk.local:
+ cmp<<count>>.mcp-queens-dvr.local:
reclass_storage_name: openstack_compute_rack01
roles:
- openstack_compute
@@ -186,7 +178,7 @@
ens6:
role: bond1_ab_ovs_floating
- gtw01.mcp11-ovs-dpdk.local:
+ gtw01.mcp-queens-dvr.local:
reclass_storage_name: openstack_gateway_node01
roles:
- openstack_gateway
@@ -201,36 +193,22 @@
ens6:
role: bond1_ab_ovs_floating
-# dns01.mcp11-ovs-dpdk.local:
+# dns01.mcp-queens-dvr.local:
# reclass_storage_name: openstack_dns_node01
# roles:
-# - features_designate_pool_manager_dns
# - linux_system_codename_xenial
-# classes:
-# - system.linux.system.repo.mcp.extra
-# - system.linux.system.repo.mcp.apt_mirantis.openstack
-# - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-# - system.linux.system.repo.mcp.apt_mirantis.saltstack
# interfaces:
# ens3:
# role: single_dhcp
# ens4:
# role: single_ctl
-# single_address: ${_param:openstack_dns_node01_address}
#
-# dns02.mcp11-ovs-dpdk.local:
+# dns02.mcp-queens-dvr.local:
# reclass_storage_name: openstack_dns_node02
# roles:
-# - features_designate_pool_manager_dns
# - linux_system_codename_xenial
-# classes:
-# - system.linux.system.repo.mcp.extra
-# - system.linux.system.repo.mcp.apt_mirantis.openstack
-# - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-# - system.linux.system.repo.mcp.apt_mirantis.saltstack
# interfaces:
# ens3:
-# role: single_dhcp
+# role: single_dhcp
# ens4:
-# role: single_ctl
-# single_address: ${_param:openstack_dns_node02_address}
+# role: single_ctl
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/salt.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/salt.yaml
index 309eb8e..80896e9 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/salt.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/salt.yaml
@@ -19,13 +19,6 @@
{{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }}
-- description: Start compute node addresses from .105 , as in static models
- cmd: |
- sed -i 's/start: 101/start: 105/g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;ml;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: true
-
{{ SHARED.MACRO_GENERATE_INVENTORY() }}
{{ SHARED.MACRO_NETWORKING_WORKAROUNDS() }}
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/underlay.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/underlay.yaml
index b30c9dc..b8f71b7 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/underlay.yaml
@@ -18,8 +18,8 @@
{% set HOSTNAME_CTL01 = os_env('HOSTNAME_CTL01', 'ctl01.' + DOMAIN_NAME) %}
{% set HOSTNAME_CTL02 = os_env('HOSTNAME_CTL02', 'ctl02.' + DOMAIN_NAME) %}
{% set HOSTNAME_CTL03 = os_env('HOSTNAME_CTL03', 'ctl03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMP01 = os_env('HOSTNAME_CMP01', 'cmp01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMP02 = os_env('HOSTNAME_CMP02', 'cmp02.' + DOMAIN_NAME) %}
+{% set HOSTNAME_CMP01 = os_env('HOSTNAME_CMP01', 'cmp1.' + DOMAIN_NAME) %}
+{% set HOSTNAME_CMP02 = os_env('HOSTNAME_CMP02', 'cmp2.' + DOMAIN_NAME) %}
{% set HOSTNAME_MON01 = os_env('HOSTNAME_MON01', 'mon01.' + DOMAIN_NAME) %}
{% set HOSTNAME_MON02 = os_env('HOSTNAME_MON02', 'mon02.' + DOMAIN_NAME) %}
{% set HOSTNAME_MON03 = os_env('HOSTNAME_MON03', 'mon03.' + DOMAIN_NAME) %}
@@ -145,6 +145,8 @@
default_{{ HOSTNAME_MTR02 }}: +87
default_{{ HOSTNAME_MTR03 }}: +88
default_{{ HOSTNAME_GTW01 }}: +110
+# default_{{ HOSTNAME_DNS01 }}: +111
+# default_{{ HOSTNAME_DNS02 }}: +112
default_{{ HOSTNAME_PRX01 }}: +121
ip_ranges:
dhcp: [+130, +220]