Fix pike,queens contrail models
Add 'secrets_encryption_enabled' and 'openstack_keystone_security'
Fix vsrx for bm and heat envs
Add valid public and tempest network for tests
Remove kvm4-6
Change-Id: I4a1632b77f95d5197deb5970a3200606910a5e74
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 3ee6bae..264877f 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -82,6 +82,7 @@
tenant_vlan: '2423'
backend_vlan: '2424'
storage_vlan: '2425' # not implemented yet, placeholder
+ jenkins_pipelines_branch: 'release/2019.2.0'
cookiecutter_template_branch: ''
cookiecutter_template_credentials: gerrit
cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
@@ -181,55 +182,55 @@
power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
- kvm04: # cz8065-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- # pxe_interface_mac:
- pxe_interface_mac: "0c:c4:7a:a8:b8:22"
- interfaces:
- enp8s0f0:
- mac: "0c:c4:7a:a8:b8:22"
- mode: "static"
- ip: "==IPV4_NET_ADMIN_PREFIX==.70"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "5.43.227.110"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- kvm05: # #cz8066-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:a8:b8:1a"
- interfaces:
- enp8s0f0:
- mac: "0c:c4:7a:a8:b8:1a"
- mode: "static"
- ip: "==IPV4_NET_ADMIN_PREFIX==.71"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "5.43.227.111"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- kvm06: # #cz8067-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:a8:b8:1c"
- interfaces:
- enp8s0f0:
- mac: "0c:c4:7a:a8:b8:1c"
- mode: "static"
- ip: "==IPV4_NET_ADMIN_PREFIX==.72"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "5.43.227.112"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
+ # kvm04: # cz8065-kvm.host-telecom.com
+ # distro_series: "xenial"
+ # # hwe_kernel: "hwe-16.04"
+ # # pxe_interface_mac:
+ # pxe_interface_mac: "0c:c4:7a:a8:b8:22"
+ # interfaces:
+ # enp8s0f0:
+ # mac: "0c:c4:7a:a8:b8:22"
+ # mode: "static"
+ # ip: "==IPV4_NET_ADMIN_PREFIX==.70"
+ # subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ # gateway: ${_param:deploy_network_gateway}
+ # power_parameters:
+ # power_address: "5.43.227.110"
+ # power_pass: ==IPMI_PASS==
+ # power_type: ipmi
+ # power_user: ==IPMI_USER==
+ # kvm05: # #cz8066-kvm.host-telecom.com
+ # distro_series: "xenial"
+ # # hwe_kernel: "hwe-16.04"
+ # pxe_interface_mac: "0c:c4:7a:a8:b8:1a"
+ # interfaces:
+ # enp8s0f0:
+ # mac: "0c:c4:7a:a8:b8:1a"
+ # mode: "static"
+ # ip: "==IPV4_NET_ADMIN_PREFIX==.71"
+ # subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ # gateway: ${_param:deploy_network_gateway}
+ # power_parameters:
+ # power_address: "5.43.227.111"
+ # power_pass: ==IPMI_PASS==
+ # power_type: ipmi
+ # power_user: ==IPMI_USER==
+ # kvm06: # #cz8067-kvm.host-telecom.com
+ # distro_series: "xenial"
+ # # hwe_kernel: "hwe-16.04"
+ # pxe_interface_mac: "0c:c4:7a:a8:b8:1c"
+ # interfaces:
+ # enp8s0f0:
+ # mac: "0c:c4:7a:a8:b8:1c"
+ # mode: "static"
+ # ip: "==IPV4_NET_ADMIN_PREFIX==.72"
+ # subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ # gateway: ${_param:deploy_network_gateway}
+ # power_parameters:
+ # power_address: "5.43.227.112"
+ # power_pass: ==IPMI_PASS==
+ # power_type: ipmi
+ # power_user: ==IPMI_USER==
osd001: # #cz5272-kvm.host-telecom.com
distro_series: "xenial"
# hwe_kernel: "hwe-16.04"
@@ -334,7 +335,7 @@
opencontrail_enabled: 'True'
opencontrail_router01_address: ==IPV4_NET_CONTROL_PREFIX==.220
opencontrail_router01_hostname: rtr01
- opencontrail_router02_address: ==IPV4_NET_CONTROL_PREFIX==.101
+ opencontrail_router02_address: ==IPV4_NET_EXTERNAL_PREFIX==.220
opencontrail_router02_hostname: rtr02
openssh_groups: ''
openstack_benchmark_node01_address: ==IPV4_NET_CONTROL_PREFIX==.95
@@ -503,6 +504,11 @@
openstack_internal_protocol: 'https'
cinder_backup_engine: 'ceph'
cinder_ceph_backup_pool_name: 'backups'
+ openstack_create_public_network: 'True'
+ openstack_public_neutron_subnet_gateway: 192.168.200.1
+ openstack_public_neutron_subnet_cidr: 192.168.200.0/24
+ openstack_public_neutron_subnet_allocation_start: 192.168.200.10
+ openstack_public_neutron_subnet_allocation_end: 192.168.200.250
openstack_keystone_security:
disable_user_account_days_inactive: 7
lockout_failure_attempts: 60
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-environment.yaml
index 37c1941..4af366f 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-environment.yaml
@@ -10,7 +10,10 @@
role: single_static_mgm
ens4:
role: single_static_ctl
- # Physical nodes
+ ens6:
+ role: single_external
+ external_address: 10.9.0.15
+ external_network_netmask: 255.255.255.0
kvm01.heat-bm-cicd-queens-contrail-sl.local:
reclass_storage_name: infra_kvm_node01
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
index 45b5b2a..81438e8 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
@@ -32,7 +32,7 @@
default: "10.8.0.0/24"
external_subnet_cidr:
type: string
- default: "192.168.200.0/24"
+ default: "10.9.0.0/24"
management_subnet_cidr:
type: string
default: "172.16.49.64/26"
@@ -132,6 +132,36 @@
- '.'
- [ { get_attr: [subnets, external_net_prefix] }, '5' ]
instance_config_host: { get_attr: [cfg01_node, instance_address] }
+
+ vsrx_node:
+ type: MCP::VsrxNode
+ depends_on: [cfg01_node]
+ properties:
+ env_name: { get_param: env_name }
+ mcp_version: { get_param: mcp_version }
+ instance_domain: {get_param: instance_domain}
+ instance_name: vsrx
+ instance_flavor: {get_param: vsrx_flavor}
+ availability_zone: { get_param: bm_availability_zone }
+ management_net: 'system-phys-2421'
+ control_net: 'system-phys-2422'
+ tenant_net: 'system-phys-2423'
+ external_net: 'system-phys-2424'
+ instance_image: system_vsrx-12.1X46-D20.5
+ control_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, control_net_prefix] }, '220' ]
+ tenant_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, tenant_net_prefix] }, '220' ]
+ external_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, external_net_prefix] }, '220' ]
+ instance_config_host: { get_attr: [cfg01_node, instance_address] }
+
outputs:
foundation_public_ip:
description: foundation node IP address (management)