Modifying new cookied model for baremetal
Removing openstack_telemetry (mdb) nodes due to this merge
https://github.com/Mirantis/mk2x-cookiecutter-reclass-model/commit/6191e302eecaf62451415ec2eeea992b28d11f71
Hack virouter
reboot cmp
change cookiecutter-contex to another file (with dpdk)
Change stacklight VIP determining
Move cinder lvm to computes
Add workarounds for cinder backend
Change-Id: I9bfe68a91723563bbd1507d6468b8f4b9efe2861
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
index 4eecd23..f791c23 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
@@ -7,7 +7,7 @@
compute_primary_second_nic: enp5s0f1
context_seed: WCQ00jbWQE6qxjDdhHsS7SNGExTJ9HVanC9LXyJHF2IIe0Qj6vtaXFP5FSwEK6jm
control_network_netmask: 255.255.255.0
- control_network_subnet: 10.167.4.0/24
+ control_network_subnet: 10.167.8.0/24
control_vlan: '2422'
cookiecutter_template_branch: master
cookiecutter_template_credentials: gerrit
@@ -21,94 +21,95 @@
email_address: sgudz@mirantis.com
infra_bond_mode: active-backup
infra_deploy_nic: eth0
- infra_kvm01_control_address: 10.167.4.241
+ infra_kvm01_control_address: 10.167.8.241
infra_kvm01_deploy_address: 172.16.49.67
infra_kvm01_hostname: kvm01
- infra_kvm02_control_address: 10.167.4.242
+ infra_kvm02_control_address: 10.167.8.242
infra_kvm02_deploy_address: 172.16.49.68
infra_kvm02_hostname: kvm02
- infra_kvm03_control_address: 10.167.4.243
+ infra_kvm03_control_address: 10.167.8.243
infra_kvm03_deploy_address: 172.16.49.69
infra_kvm03_hostname: kvm03
- infra_kvm_vip_address: 10.167.4.240
+ infra_kvm_vip_address: 10.167.8.240
infra_primary_first_nic: eth2
infra_primary_second_nic: eth3
kubernetes_enabled: 'False'
local_repositories: 'False'
- maas_deploy_address: 10.167.4.91
+ maas_deploy_address: 10.167.8.91
maas_hostname: cfg01
- opencontrail_analytics_address: 10.167.4.30
+ opencontrail_analytics_address: 10.167.8.30
opencontrail_analytics_hostname: nal
- opencontrail_analytics_node01_address: 10.167.4.31
+ opencontrail_analytics_node01_address: 10.167.8.31
opencontrail_analytics_node01_hostname: nal01
- opencontrail_analytics_node02_address: 10.167.4.32
+ opencontrail_analytics_node02_address: 10.167.8.32
opencontrail_analytics_node02_hostname: nal02
- opencontrail_analytics_node03_address: 10.167.4.33
+ opencontrail_analytics_node03_address: 10.167.8.33
opencontrail_analytics_node03_hostname: nal03
opencontrail_compute_iface_mask: '24'
- opencontrail_control_address: 10.167.4.20
+ opencontrail_control_address: 10.167.8.20
opencontrail_control_hostname: ntw
- opencontrail_control_node01_address: 10.167.4.21
+ opencontrail_control_node01_address: 10.167.8.21
opencontrail_control_node01_hostname: ntw01
- opencontrail_control_node02_address: 10.167.4.22
+ opencontrail_control_node02_address: 10.167.8.22
opencontrail_control_node02_hostname: ntw02
- opencontrail_control_node03_address: 10.167.4.23
+ opencontrail_control_node03_address: 10.167.8.23
opencontrail_control_node03_hostname: ntw03
opencontrail_enabled: 'True'
- opencontrail_router01_address: 10.167.4.100
+ opencontrail_router01_address: 10.167.8.100
opencontrail_router01_hostname: rtr01
- opencontrail_router02_address: 10.167.4.101
+ opencontrail_router02_address: 10.167.8.101
opencontrail_router02_hostname: rtr02
- openstack_benchmark_node01_address: 10.167.4.95
+
+ openstack_benchmark_node01_address: 10.167.8.95
openstack_benchmark_node01_hostname: bmk01
openstack_compute_count: '1'
openstack_compute_rack01_hostname: cmpt
- openstack_compute_rack01_single_subnet: 10.167.4
+ openstack_compute_rack01_single_subnet: 10.167.8
openstack_compute_rack01_tenant_subnet: 192.168.0
openstack_compute_node01_hostname: cmp001
openstack_compute_node02_hostname: cmp002
- openstack_compute_node01_address: 10.167.4.72
- openstack_compute_node02_address: 10.167.4.74
- openstack_compute_node01_single_address: 10.167.4.72
- openstack_compute_node02_single_address: 10.167.4.74
+ openstack_compute_node01_address: 10.167.8.101
+ openstack_compute_node02_address: 10.167.8.102
+ openstack_compute_node01_single_address: 10.167.8.101
+ openstack_compute_node02_single_address: 10.167.8.102
openstack_compute_node01_deploy_address: 172.16.49.72
openstack_compute_node02_deploy_address: 172.16.49.74
- openstack_control_address: 10.167.4.10
+ openstack_control_address: 10.167.8.10
openstack_control_hostname: ctl
- openstack_control_node01_address: 10.167.4.11
+ openstack_control_node01_address: 10.167.8.11
openstack_control_node01_hostname: ctl01
- openstack_control_node02_address: 10.167.4.12
+ openstack_control_node02_address: 10.167.8.12
openstack_control_node02_hostname: ctl02
- openstack_control_node03_address: 10.167.4.13
+ openstack_control_node03_address: 10.167.8.13
openstack_control_node03_hostname: ctl03
- openstack_database_address: 10.167.4.50
+ openstack_database_address: 10.167.8.50
openstack_database_hostname: dbs
- openstack_database_node01_address: 10.167.4.51
+ openstack_database_node01_address: 10.167.8.51
openstack_database_node01_hostname: dbs01
- openstack_database_node02_address: 10.167.4.52
+ openstack_database_node02_address: 10.167.8.52
openstack_database_node02_hostname: dbs02
- openstack_database_node03_address: 10.167.4.53
+ openstack_database_node03_address: 10.167.8.53
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
- openstack_message_queue_address: 10.167.4.40
+ openstack_message_queue_address: 10.167.8.40
openstack_message_queue_hostname: msg
- openstack_message_queue_node01_address: 10.167.4.41
+ openstack_message_queue_node01_address: 10.167.8.41
openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_address: 10.167.4.42
+ openstack_message_queue_node02_address: 10.167.8.42
openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_address: 10.167.4.43
+ openstack_message_queue_node03_address: 10.167.8.43
openstack_message_queue_node03_hostname: msg03
openstack_network_engine: opencontrail
- openstack_nfv_dpdk_enabled: 'False'
+ openstack_nfv_dpdk_enabled: 'True'
openstack_nfv_sriov_enabled: 'False'
openstack_nova_compute_nfv_req_enabled: 'False'
- openstack_proxy_address: 10.167.4.80
+ openstack_proxy_address: 10.167.8.80
openstack_proxy_hostname: prx
- openstack_proxy_node01_address: 10.167.4.81
+ openstack_proxy_node01_address: 10.167.8.81
openstack_proxy_node01_hostname: prx01
- openstack_proxy_node02_address: 10.167.4.82
+ openstack_proxy_node02_address: 10.167.8.82
openstack_proxy_node02_hostname: prx02
openstack_version: ocata
oss_enabled: 'False'
@@ -120,42 +121,41 @@
public_host: ${_param:openstack_proxy_address}
publication_method: email
reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
- salt_api_password: BIDWhCG4zuArfGwwKDuh3q32jdTLrWS1
- salt_api_password_hash: $6$bGHqshet$Rf1A7.SWK.8VattpFelJ8yC4OHdnXCZdIIRsMLtoOb1ZDDO7meEEpqTWJY4xpQbXaXwO0aLjVDcF34ucfuxpb1
- salt_master_address: 10.167.4.66
+ salt_master_address: 10.167.8.66
salt_master_hostname: cfg01
salt_master_management_address: 172.16.49.66
shared_reclass_url: ssh://mcp-jenkins@gerrit.mcp.mirantis.net:29418/salt-models/reclass-system.git
stacklight_enabled: 'True'
- stacklight_log_address: 10.167.4.60
+ stacklight_log_address: 10.167.8.60
stacklight_log_hostname: log
- stacklight_log_node01_address: 10.167.4.61
+ stacklight_log_node01_address: 10.167.8.61
stacklight_log_node01_hostname: log01
- stacklight_log_node02_address: 10.167.4.62
+ stacklight_log_node02_address: 10.167.8.62
stacklight_log_node02_hostname: log02
- stacklight_log_node03_address: 10.167.4.63
+ stacklight_log_node03_address: 10.167.8.63
stacklight_log_node03_hostname: log03
- stacklight_monitor_address: 10.167.4.70
+ stacklight_monitor_address: 10.167.8.70
stacklight_monitor_hostname: mon
- stacklight_monitor_node01_address: 10.167.4.71
+ stacklight_monitor_node01_address: 10.167.8.71
stacklight_monitor_node01_hostname: mon01
- stacklight_monitor_node02_address: 10.167.4.72
+ stacklight_monitor_node02_address: 10.167.8.72
stacklight_monitor_node02_hostname: mon02
- stacklight_monitor_node03_address: 10.167.4.73
+ stacklight_monitor_node03_address: 10.167.8.73
stacklight_monitor_node03_hostname: mon03
stacklight_notification_address: alerts@localhost
stacklight_notification_smtp_host: 127.0.0.1
- stacklight_telemetry_address: 10.167.4.85
+ stacklight_telemetry_address: 10.167.8.85
stacklight_telemetry_hostname: mtr
- stacklight_telemetry_node01_address: 10.167.4.86
+ stacklight_telemetry_node01_address: 10.167.8.86
stacklight_telemetry_node01_hostname: mtr01
- stacklight_telemetry_node02_address: 10.167.4.87
+ stacklight_telemetry_node02_address: 10.167.8.87
stacklight_telemetry_node02_hostname: mtr02
- stacklight_telemetry_node03_address: 10.167.4.88
+ stacklight_telemetry_node03_address: 10.167.8.88
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
- tenant_network_gateway: 192.168.0.1
+ tenant_network_gateway: ''
tenant_network_netmask: 255.255.255.0
tenant_network_subnet: 192.168.0.0/24
tenant_vlan: '2423'
upstream_proxy_enabled: 'False'
+ openstack_nova_compute_hugepages_count: 40