Change cluster size for bm-contrail + barbican,designate,telemetry
Change-Id: Ic7566ffe6577535b0a45ee425d940342931a0828
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 d036f4c..0856cc1 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
@@ -127,7 +127,7 @@
maas_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.66
maas_deploy_cidr: ==IPV4_NET_ADMIN_PREFIX==.64/26
maas_deploy_gateway: ==IPV4_NET_ADMIN_PREFIX==.65
- maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.119
+ maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.121
maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.78
maas_deploy_vlan: '0'
maas_dhcp_enabled: 'True'
@@ -184,55 +184,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"
@@ -342,7 +342,7 @@
openssh_groups: ''
openstack_benchmark_node01_address: ==IPV4_NET_CONTROL_PREFIX==.95
openstack_benchmark_node01_hostname: bmk01
- openstack_cluster_size: compact
+ openstack_cluster_size: nfvi
openstack_compute_count: '2'
openstack_compute_rack01_hostname: cmp
openstack_compute_single_address_ranges: ==IPV4_NET_CONTROL_PREFIX==.101-==IPV4_NET_CONTROL_PREFIX==.102
@@ -494,8 +494,31 @@
ceph_rgw_node03_address: "==IPV4_NET_CONTROL_PREFIX==.78"
ceph_rgw_node03_hostname: "rgw03"
manila_enabled: 'False'
- barbican_enabled: 'False'
+ designate_backend: powerdns
+ designate_enabled: 'True'
+ openstack_dns_node01_address: ==IPV4_NET_CONTROL_PREFIX==.113
+ openstack_dns_node02_address: ==IPV4_NET_CONTROL_PREFIX==.114
+ tenant_telemetry_enabled: 'True'
+ gnocchi_aggregation_storage: ceph
+ openstack_telemetry_address: ==IPV4_NET_CONTROL_PREFIX==.83
+ openstack_telemetry_hostname: mdb
+ openstack_telemetry_node01_address: ==IPV4_NET_CONTROL_PREFIX==.84
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_address: ==IPV4_NET_CONTROL_PREFIX==.85
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.86
+ openstack_telemetry_node03_hostname: mdb03
+ barbican_backend: dogtag
+ barbican_enabled: 'True'
barbican_integration_enabled: 'False'
+ openstack_barbican_address: ==IPV4_NET_CONTROL_PREFIX==.44
+ openstack_barbican_hostname: kmn
+ openstack_barbican_node01_address: ==IPV4_NET_CONTROL_PREFIX==.45
+ openstack_barbican_node01_hostname: kmn01
+ openstack_barbican_node02_address: ==IPV4_NET_CONTROL_PREFIX==.46
+ openstack_barbican_node02_hostname: kmn02
+ openstack_barbican_node03_address: ==IPV4_NET_CONTROL_PREFIX==.47
+ openstack_barbican_node03_hostname: kmn03
# SSL settings
nova_vnc_tls_enabled: 'True'
stacklight_ssl_enabled: 'True'