Make fixes for CC generating
MOSSUST-111
Change-Id: Iba54be8bb2b1f18e79656ffca102702daf1b48b7
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 1387811..24efd98 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -382,8 +382,8 @@
openstack_compute_rack01_hostname: cmp
openstack_compute_single_address_ranges: 10.167.11.15-10.167.11.16
openstack_compute_deploy_address_ranges: 172.16.162.73-172.16.162.74
- openstack_compute_tenant_address_ranges: 10.167.12.15-10.167.12.17
- openstack_compute_backend_address_ranges: 10.167.12.15-10.167.12.17
+ openstack_compute_tenant_address_ranges: 10.167.13.15-10.167.13.17
+ openstack_compute_backend_address_ranges: 10.167.13.15-10.167.13.17
openstack_control_address: 10.167.11.10
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.11.11
@@ -404,7 +404,7 @@
openstack_gateway_node01_deploy_address: 172.16.162.72
openstack_gateway_node01_address: 10.167.11.224
openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node01_tenant_address: 10.167.12.9
+ openstack_gateway_node01_tenant_address: 10.167.13.9
openstack_message_queue_address: 10.167.11.40
openstack_message_queue_hostname: msg
openstack_message_queue_node01_address: 10.167.11.41
@@ -478,51 +478,14 @@
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
- tenant_network_gateway: 10.167.12.1
+ tenant_network_gateway: 10.167.13.1
tenant_network_netmask: 255.255.255.0
- tenant_network_subnet: 10.167.12.0/24
+ tenant_network_subnet: 10.167.13.0/24
tenant_vlan: '2406'
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
sriov_network_subnet: 192.168.10.0/24
ceph_enabled: 'False'
- ceph_version: "luminous"
- ceph_hyper_converged: "False"
- ceph_osd_backend: "bluestore"
- ceph_osd_count: "3"
- ceph_osd_node_count: 3
- ceph_osd_block_db_size: 20
- ceph_osd_journal_size: 20
- ceph_osd_bond_mode: "active-backup"
- ceph_osd_data_partition_prefix: ""
- ceph_osd_block_partition_prefix: ""
- ceph_public_network_allocation: storage
- ceph_cluster_network: "10.167.11.0/24"
- ceph_osd_single_address_ranges: "10.167.11.200-10.167.11.202"
- ceph_osd_deploy_address_ranges: "172.16.164.8-172.16.164.10"
- ceph_osd_storage_address_ranges: "10.167.11.200-10.167.11.202"
- ceph_osd_backend_address_ranges: "10.167.12.200-10.167.12.202"
- ceph_osd_data_disks: "/dev/sdb"
- ceph_osd_journal_or_block_db_disks: "/dev/sdc"
- ceph_osd_mode: "separated"
- ceph_osd_deploy_nic: "eth0"
- ceph_osd_primary_first_nic: "eth1"
- ceph_osd_primary_second_nic: "eth2"
- ceph_mon_node01_address: "10.167.11.66"
- ceph_mon_node01_hostname: "cmn01"
- ceph_mon_node02_address: "10.167.11.67"
- ceph_mon_node02_hostname: "cmn02"
- ceph_mon_node03_address: "10.167.11.68"
- ceph_mon_node03_hostname: "cmn03"
- ceph_rgw_address: "10.167.11.75"
- ceph_rgw_node01_address: "10.167.11.76"
- ceph_rgw_node01_hostname: "rgw01"
- ceph_rgw_node02_address: "10.167.11.77"
- ceph_rgw_node02_hostname: "rgw02"
- ceph_rgw_node03_address: "10.167.11.78"
- ceph_rgw_node03_hostname: "rgw03"
-
- ceph_public_network: 10.167.11.0/24
rsync_fernet_rotation: 'True'
compute_padding_with_zeros: True
@@ -557,10 +520,10 @@
openstack_barbican_node03_address: 10.167.11.47
openstack_barbican_node03_hostname: kmn03
openstack_create_public_network: 'True'
- openstack_public_neutron_subnet_gateway: 172.17.42.1
- openstack_public_neutron_subnet_cidr: 172.17.42.0/26
- openstack_public_neutron_subnet_allocation_start: 172.17.42.20
- openstack_public_neutron_subnet_allocation_end: 172.17.42.55
+ openstack_public_neutron_subnet_gateway: 172.17.42.65
+ openstack_public_neutron_subnet_cidr: 172.17.42.64/26
+ openstack_public_neutron_subnet_allocation_start: 172.17.42.82
+ openstack_public_neutron_subnet_allocation_end: 172.17.42.112
backend_vlan: '2402'
storage_vlan: '2405' # not implemented yet, placeholder
kqueen_custom_mail_enabled: 'False'
@@ -577,8 +540,6 @@
octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
openstack_octavia_enabled: 'True'
- cinder_backup_engine: 'ceph'
- cinder_ceph_backup_pool_name: 'backups'
openstack_keystone_security:
disable_user_account_days_inactive: 7
lockout_failure_attempts: 60