add osd03 node
Change-Id: I54314564608056a680b0e20d102931fb35f5f660
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
index 2a6353e..67b31e3 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
@@ -45,19 +45,19 @@
ceph_osd_backend: bluestore
ceph_osd_block_db_size: '10'
ceph_osd_bond_mode: active-backup
- ceph_osd_count: '2'
+ ceph_osd_count: '3'
ceph_osd_data_disks: /dev/vdb
ceph_osd_journal_or_block_db_disks: /dev/vdc
- ceph_osd_node_count: '2'
+ ceph_osd_node_count: '3'
ceph_osd_journal_size: '10'
ceph_osd_primary_first_nic: eth1
ceph_osd_primary_second_nic: eth2
ceph_osd_rack01_backend_subnet: 10.167.4
ceph_osd_rack01_hostname: osd
ceph_osd_rack01_single_subnet: 10.167.4
- ceph_osd_single_address_ranges: 10.167.4.94-10.167.4.95
- ceph_osd_deploy_address_ranges: 10.167.5.94-10.167.5.95
- ceph_osd_backend_address_ranges: 10.167.4.94-10.167.4.95
+ ceph_osd_single_address_ranges: 10.167.4.87-10.167.4.89
+ ceph_osd_deploy_address_ranges: 10.167.5.87-10.167.5.89
+ ceph_osd_backend_address_ranges: 10.167.4.87-10.167.4.89
ceph_public_network: 10.167.4.0/24
ceph_rgw_address: 10.167.4.75
ceph_rgw_hostname: rgw
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay.yaml
index c53173b..ec59f14 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay.yaml
@@ -28,6 +28,7 @@
{% set HOSTNAME_RGW03 = os_env('HOSTNAME_RGW03', 'rgw03.' + DOMAIN_NAME) %}
{% set HOSTNAME_OSD01 = os_env('HOSTNAME_OSD01', 'osd1.' + DOMAIN_NAME) %}
{% set HOSTNAME_OSD02 = os_env('HOSTNAME_OSD02', 'osd2.' + DOMAIN_NAME) %}
+{% set HOSTNAME_OSD03 = os_env('HOSTNAME_OSD03', 'osd3.' + DOMAIN_NAME) %}
{% set HOSTNAME_GTW01 = os_env('HOSTNAME_GTW01', 'gtw01.' + DOMAIN_NAME) %}
{% set HOSTNAME_PRX01 = os_env('HOSTNAME_PRX01', 'prx01.' + DOMAIN_NAME) %}
{% set HOSTNAME_MON01 = os_env('HOSTNAME_MON01', 'mon01.' + DOMAIN_NAME) %}
@@ -61,8 +62,9 @@
default_{{ HOSTNAME_CID01 }}: +91
default_{{ HOSTNAME_CID02 }}: +92
default_{{ HOSTNAME_CID03 }}: +93
- default_{{ HOSTNAME_OSD01 }}: +94
- default_{{ HOSTNAME_OSD02 }}: +95
+ default_{{ HOSTNAME_OSD01 }}: +87
+ default_{{ HOSTNAME_OSD02 }}: +88
+ default_{{ HOSTNAME_OSD03 }}: +89
default_{{ HOSTNAME_CMN01 }}: +96
default_{{ HOSTNAME_CMN02 }}: +97
default_{{ HOSTNAME_CMN03 }}: +98
@@ -99,8 +101,9 @@
default_{{ HOSTNAME_CID01 }}: +91
default_{{ HOSTNAME_CID02 }}: +92
default_{{ HOSTNAME_CID03 }}: +93
- default_{{ HOSTNAME_OSD01 }}: +94
- default_{{ HOSTNAME_OSD02 }}: +95
+ default_{{ HOSTNAME_OSD01 }}: +87
+ default_{{ HOSTNAME_OSD02 }}: +88
+ default_{{ HOSTNAME_OSD03 }}: +89
default_{{ HOSTNAME_CMN01 }}: +96
default_{{ HOSTNAME_CMN02 }}: +97
default_{{ HOSTNAME_CMN03 }}: +98
@@ -133,8 +136,9 @@
default_{{ HOSTNAME_CTL03 }}: +13
default_{{ HOSTNAME_CMP01 }}: +105
default_{{ HOSTNAME_CMP02 }}: +106
- default_{{ HOSTNAME_OSD01 }}: +94
- default_{{ HOSTNAME_OSD02 }}: +95
+ default_{{ HOSTNAME_OSD01 }}: +87
+ default_{{ HOSTNAME_OSD02 }}: +88
+ default_{{ HOSTNAME_OSD03 }}: +89
default_{{ HOSTNAME_CMN01 }}: +96
default_{{ HOSTNAME_CMN02 }}: +97
default_{{ HOSTNAME_CMN03 }}: +98
@@ -167,8 +171,9 @@
default_{{ HOSTNAME_CTL03 }}: +13
default_{{ HOSTNAME_CMP01 }}: +105
default_{{ HOSTNAME_CMP02 }}: +106
- default_{{ HOSTNAME_OSD01 }}: +94
- default_{{ HOSTNAME_OSD02 }}: +95
+ default_{{ HOSTNAME_OSD01 }}: +87
+ default_{{ HOSTNAME_OSD02 }}: +88
+ default_{{ HOSTNAME_OSD03 }}: +89
default_{{ HOSTNAME_CMN01 }}: +96
default_{{ HOSTNAME_CMN02 }}: +97
default_{{ HOSTNAME_CMN03 }}: +98
@@ -508,6 +513,38 @@
interfaces: *interfaces
network_config: *network_config
+ - name: {{ HOSTNAME_OSD03 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 2
+ memory: !os_env SLAVE_NODE_MEMORY, 2048
+ boot:
+ - hd
+ cloud_init_volume_name: iso
+ cloud_init_iface_up: ens3
+ volumes:
+ - name: system
+ capacity: !os_env NODE_VOLUME_SIZE, 150
+ backing_store: cloudimage1604
+ format: qcow2
+ - name: ceph_osd
+ capacity: 50
+ format: qcow2
+ - name: ceph_journal
+ capacity: 50
+ format: qcow2
+ - name: iso # Volume with name 'iso' will be used
+ # for store image with cloud-init metadata.
+ capacity: 1
+ format: raw
+ device: cdrom
+ bus: ide
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_1604
+
+ interfaces: *interfaces
+ network_config: *network_config
+
- name: {{ HOSTNAME_RGW01 }}
role: salt_minion
params: