Add required nodes for cookiecutter config cicd+ovs+dvr
Change-Id: Ief997750fe42ddb7f4185ae5689d41206dc5cbbc
Reviewed-on: https://review.gerrithub.io/376568
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git a/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml b/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
index d6805f8..44b82ae 100644
--- a/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
+++ b/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
@@ -10,7 +10,7 @@
enp3s0f0:
role: management_single
enp3s0f1:
- role: control_bond0
+ role: control_vlan_bond0
kvm02.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node02
@@ -21,7 +21,7 @@
eno1:
role: management_single
eno2:
- role: control_bond0
+ role: control_vlan_bond0
kvm03.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node03
@@ -32,7 +32,7 @@
eno1:
role: management_single
eno2:
- role: control_bond0
+ role: control_vlan_bond0
cmp001.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_compute_node01
@@ -43,9 +43,9 @@
enp3s0f0:
role: management_single
enp3s0f1:
- role: control_bond0
+ role: control_vlan_bond0
enp5s0f0:
- role: control_bond0
+ role: control_vlan_bond0
enp5s0f1:
role: private_dpdk_ovs
dpdk_pci: '0000:05:00.1'
@@ -62,9 +62,9 @@
eno1:
role: management_single
eth0:
- role: control_bond0
+ role: control_vlan_bond0
eth3:
- role: control_bond0
+ role: control_vlan_bond0
eth2:
role: private_dpdk_ovs
dpdk_pci: '0000:05:00.1'
diff --git a/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml b/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
index 71ee047..d68787c 100644
--- a/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
+++ b/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
@@ -1,56 +1,117 @@
nodes:
+ kvm01.mcp11-ovs-dpdk.local:
+ reclass_storage_name: infra_kvm_node01
+ roles:
+ - infra_kvm
+ - linux_system_codename_xenial
+ interfaces:
+ ens4:
+ role: control_vcp_single
+
+ kvm02.mcp11-ovs-dpdk.local:
+ reclass_storage_name: infra_kvm_node02
+ roles:
+ - infra_kvm
+ - linux_system_codename_xenial
+ interfaces:
+ ens4:
+ role: control_vcp_single
+
+ kvm03.mcp11-ovs-dpdk.local:
+ reclass_storage_name: infra_kvm_node03
+ roles:
+ - infra_kvm
+ - linux_system_codename_xenial
+ interfaces:
+ ens4:
+ role: control_vcp_single
+
+ cid01.mcp11-ovs-dpdk.local:
+ reclass_storage_name: cicd_control_node01
+ roles:
+ - cicd_control_leader
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: control_vcp_single
+
+ cid02.mcp11-ovs-dpdk.local:
+ reclass_storage_name: cicd_control_node02
+ roles:
+ - cicd_control_manager
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: control_vcp_single
+
+ cid03.mcp11-ovs-dpdk.local:
+ reclass_storage_name: cicd_control_node03
+ roles:
+ - cicd_control_manager
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: control_vcp_single
+
ctl01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node01
roles:
- openstack_control_leader
+ - openstack_designate
+ - openstack_designate_keystone
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
ctl02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node02
roles:
- openstack_control
+ - openstack_designate
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
ctl03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node03
roles:
- openstack_control
+ - openstack_designate
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
dbs01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node01
roles:
- openstack_database_leader
+ - openstack_designate_database
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
dbs02.mcp11-ovs-dpdk.local:
- reclass_storage_name: openstack_database_node01
+ reclass_storage_name: openstack_database_node02
roles:
- openstack_database
+ - openstack_designate_database
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
dbs03.mcp11-ovs-dpdk.local:
- reclass_storage_name: openstack_database_node01
+ reclass_storage_name: openstack_database_node03
roles:
- openstack_database
+ - openstack_designate_database
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
msg01.mcp11-ovs-dpdk.local:
@@ -59,7 +120,7 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
msg02.mcp11-ovs-dpdk.local:
@@ -68,7 +129,7 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
msg03.mcp11-ovs-dpdk.local:
@@ -77,7 +138,7 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
mdb01.mcp11-ovs-dpdk.local:
@@ -86,7 +147,7 @@
- openstack_telemetry
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
mdb02.mcp11-ovs-dpdk.local:
@@ -95,7 +156,7 @@
- openstack_telemetry
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
mdb03.mcp11-ovs-dpdk.local:
@@ -104,7 +165,7 @@
- openstack_telemetry
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
prx01.mcp11-ovs-dpdk.local:
@@ -113,7 +174,7 @@
- openstack_proxy
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
prx02.mcp11-ovs-dpdk.local:
@@ -122,7 +183,7 @@
- openstack_proxy
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
mtr01.mcp11-ovs-dpdk.local:
@@ -131,7 +192,7 @@
- stacklight_telemetry
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
mtr02.mcp11-ovs-dpdk.local:
@@ -140,7 +201,7 @@
- stacklight_telemetry
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
mtr03.mcp11-ovs-dpdk.local:
@@ -149,7 +210,7 @@
- stacklight_telemetry
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
log01.mcp11-ovs-dpdk.local:
@@ -158,7 +219,7 @@
- stacklight_log_leader
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
log02.mcp11-ovs-dpdk.local:
@@ -167,7 +228,7 @@
- stacklight_log
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
log03.mcp11-ovs-dpdk.local:
@@ -176,7 +237,7 @@
- stacklight_log
- linux_system_codename_xenial
interfaces:
- ens4:
+ ens3:
role: control_vcp_single
# Generator-based computes. For compatibility only
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/.cookiecutter_compute.yml" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/.cookiecutter_compute.yml"
index 6fbf04f..2e1e8e4 100644
--- "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/.cookiecutter_compute.yml"
+++ "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/.cookiecutter_compute.yml"
@@ -1,51 +1,3 @@
-classes:
-{%- if cookiecutter.get('local_repositories', 'False') == 'True' %}
-- system.linux.system.repo_local.ubuntu
-- system.linux.system.repo_local.mcp.openstack
-- system.linux.system.repo_local.mcp.extra
-{%- if cookiecutter.openstack_network_engine == 'opencontrail' %}
-- system.linux.system.repo_local.mcp.contrail
-{%- endif %}
-{%- else %}
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.saltstack.xenial
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-{%- if cookiecutter.openstack_network_engine == 'opencontrail' %}
-- system.linux.system.repo.mcp.contrail
-{%- endif %}
-{%- endif %}
-{%- if cookiecutter.get('openstack_nova_compute_nfv_req_enabled', 'False') == 'True' or cookiecutter.get('openstack_nfv_dpdk_enabled', 'False') == 'True' %}
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
-{%- endif %}
-- system.nova.compute.cluster
-{%- if cookiecutter.openstack_network_engine == 'opencontrail' %}
-- system.opencontrail.compute.cluster
-- system.opencontrail.client.cluster
-- system.opencontrail.client.resource.virtual_router
-{%- elif cookiecutter.openstack_network_engine == 'ovs' %}
-- system.neutron.compute.cluster
-{%- endif %}
-- system.ceilometer.agent.cluster
-- cluster.{{ cookiecutter.cluster_name }}.infra
-parameters:
- _param:
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
- cluster_node03_address: ${_param:openstack_control_node03_address}
-{%- if cookiecutter.openstack_network_engine == 'opencontrail' %}
- opencontrail_compute_address: ${_param:tenant_address}
-{%- endif %}
- nova_vncproxy_url: https://${_param:cluster_public_host}:6080
- primary_first_nic: {{ cookiecutter.compute_primary_first_nic }}
- primary_second_nic: {{ cookiecutter.compute_primary_second_nic }}
-
linux:
network:
host:
@@ -70,7 +22,15 @@
proto: manual
name: ${_param:primary_second_nic}
master: bond0
+
+
{%- if cookiecutter.openstack_network_engine == 'ovs' %}
+
+
+
+
+
+ bridge: openvswitch
{%- if not cookiecutter.openstack_ovs_dvr_enabled == 'True' %}
{%- if cookiecutter.openstack_ovs_encapsulation_type == 'vxlan' %}
bond0:
@@ -128,6 +88,7 @@
address: ${_param:single_address}
netmask: ${_param:control_network_netmask}
{%- endif %}
+
{%- elif cookiecutter.openstack_ovs_dvr_enabled == 'True' %}
bond0:
enabled: true
@@ -178,7 +139,13 @@
peer: floating-to-prv
{%- endif %}
{%- endif %}
- bridge: openvswitch
+
+
+
+
+
+
+
{%- elif cookiecutter.openstack_network_engine == 'opencontrail' %}
bond0:
mtu: 9000
@@ -223,4 +190,8 @@
- ${_param:dns_server01}
- ${_param:dns_server02}
{%- endif %}
+
+
+
+
{%- endif %}
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_bond0" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_bond0"
index 38874e5..e47c2b2 100644
--- "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_bond0"
+++ "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_bond0"
@@ -22,14 +22,6 @@
{%- for interface_name in interfaces.keys() %}
- {{ interface_name }}
{%- endfor %}
- bond0.2416:
- enabled: true
- proto: manual
- type: vlan
- use_interfaces:
- - bond0
- require_interfaces:
- - bond0
br_ctl:
address: ${_param:_esc}{_param:single_address}
enabled: true
@@ -37,6 +29,6 @@
proto: static
type: bridge
use_interfaces:
- - bond0.2416
+ - bond0
require_interfaces:
- - bond0.2416
+ - bond0
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_vlan_bond0" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_vlan_bond0"
new file mode 100644
index 0000000..38874e5
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_vlan_bond0"
@@ -0,0 +1,42 @@
+
+ # {{ interfaces_role }}
+ {%- for interface_name, interface in interfaces.items() %}
+ {{ interface_name }}:
+ enabled: true
+ name: {{ interface_name }}
+ proto: manual
+ type: eth
+ ipflush_onchange: true
+ {%- endfor %}
+ bond0:
+ enabled: true
+ mode: active-backup
+ proto: manual
+ slaves: {{ ' '.join(interfaces.keys()) }}
+ type: bond
+ use_interfaces:
+ {%- for interface_name in interfaces.keys() %}
+ - {{ interface_name }}
+ {%- endfor %}
+ require_interfaces:
+ {%- for interface_name in interfaces.keys() %}
+ - {{ interface_name }}
+ {%- endfor %}
+ bond0.2416:
+ enabled: true
+ proto: manual
+ type: vlan
+ use_interfaces:
+ - bond0
+ require_interfaces:
+ - bond0
+ br_ctl:
+ address: ${_param:_esc}{_param:single_address}
+ enabled: true
+ netmask: 255.255.255.0
+ proto: static
+ type: bridge
+ use_interfaces:
+ - bond0.2416
+ require_interfaces:
+ - bond0.2416
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_leader" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_leader"
new file mode 100644
index 0000000..562647c
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_leader"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - cluster.${_param:cluster_name}.cicd.control.leader
\ No newline at end of file
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_manager" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_manager"
new file mode 100644
index 0000000..12d220e
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_manager"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - cluster.${_param:cluster_name}.cicd.control.manager
\ No newline at end of file
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate"
new file mode 100644
index 0000000..c945427
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - environment.{{ cookiecutter._env_name }}.features.designate.system
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_database" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_database"
new file mode 100644
index 0000000..006235a
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_database"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - environment.{{ cookiecutter._env_name }}.features.designate.database
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_keystone" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_keystone"
new file mode 100644
index 0000000..5e1b3c7
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_keystone"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - environment.{{ cookiecutter._env_name }}.features.designate.keystone
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/database.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/database.yml"
new file mode 100644
index 0000000..e1e12d7
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/database.yml"
@@ -0,0 +1,3 @@
+classes:
+- system.galera.server.database.designate
+- environment.{{ cookiecutter._env_name }}.features.designate
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/init.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/init.yml"
new file mode 100644
index 0000000..33f4259
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/init.yml"
@@ -0,0 +1,38 @@
+{%- macro password(size=16) -%}
+{% for index in range(size) %}{{ 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'|random }}{% endfor %}
+{%- endmacro -%}
+parameters:
+ _param:
+ # Put overrides for any environment-specific variables here
+ powerdns_webserver_password: {{ password(12) }}
+ powerdns_webserver_port: 8081
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_pdns_api_key: {{ password(12) }}
+ designate_pdns_api_endpoint: "http://${_param:openstack_control_node01_address}:${_param:powerdns_webserver_port}"
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: pdns4
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ designate_pool_target_options:
+ host: ${_param:openstack_control_node01_address}
+ port: 53
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
+ designate_version: ${_param:openstack_version}
+ designate_service_host: ${_param:openstack_control_address}
+ mysql_designate_password: {{ password(16) }}
+ keystone_designate_password: {{ password(16) }}
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/keystone.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/keystone.yml"
new file mode 100644
index 0000000..4726bf6
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/keystone.yml"
@@ -0,0 +1,3 @@
+classes:
+- system.keystone.client.service.designate
+- environment.{{ cookiecutter._env_name }}.features.designate
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/system.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/system.yml"
new file mode 100644
index 0000000..3fa26a6
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/system.yml"
@@ -0,0 +1,38 @@
+classes:
+- system.designate.server.cluster
+- system.designate.server.backend.pdns
+- environment.{{ cookiecutter._env_name }}.features.designate
+parameters:
+ powerdns:
+ server:
+ axfr_ips:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ - 127.0.0.1
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node02_address}
+ port: 53
+ api_endpoint: "http://${_param:openstack_control_node02_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node03_address}
+ port: 53
+ api_endpoint: "http://${_param:openstack_control_node03_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
index 600697e..feffa64 100644
--- "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
@@ -1,3 +1,5 @@
+{# 'infra_config_classes' list object is dynamically generated from 'roles' to add on the cfg node #}
+{%- set infra_config_classes = [] %}
parameters:
_param:
_esc: $
@@ -6,6 +8,7 @@
node:
{%- for inventory_node_name, node in nodes.items()|sort %}
{{ node['reclass_storage_name'] }}:
+ {# 'params' dict object is dynamically generated from 'roles' to add on the node #}
{%- set params = {} %}
classes:
{#- Default role linux_network_interface is added to each node #}
@@ -21,3 +24,10 @@
{%- endif %}
{%- endfor %}
+
+classes:
+# Enable root and *ALL* users access
+- system.openssh.server.team.all
+{%- for infra_config_class in infra_config_classes %}
+- {{ infra_config_class }}
+{%- endfor %}
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
index 8474d17..f74e880 100644
--- "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
@@ -1,3 +1,6 @@
+classes:
+# Enable root and *ALL* users access
+- system.openssh.server.team.all
parameters:
# _param:
# Put overrides for any environment-specific variables here
diff --git a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/common-services.yaml b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/common-services.yaml
index 0a80e82..27783f8 100644
--- a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/common-services.yaml
+++ b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/common-services.yaml
@@ -103,6 +103,13 @@
retry: {count: 1, delay: 5}
skip_fail: false
+- description: Install nginx on prx nodes
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+ -C 'I@nginx:server' state.sls nginx
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
- description: Restart rsyslog
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-C 'I@haproxy:proxy' service.restart rsyslog
diff --git a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/openstack.yaml b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/openstack.yaml
index 79ae1bc..b220186 100644
--- a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/openstack.yaml
+++ b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/openstack.yaml
@@ -295,11 +295,11 @@
retry: {count: 1, delay: 30}
skip_fail: false
-- description: Set disks 03
- cmd: salt-call cmd.run 'echo -e "nn\np\n\n\n\nw" | fdisk /dev/vdb'
- node_name: {{ HOSTNAME_CTL03 }}
- retry: {count: 1, delay: 30}
- skip_fail: false
+#- description: Set disks 03
+# cmd: salt-call cmd.run 'echo -e "nn\np\n\n\n\nw" | fdisk /dev/vdb'
+# node_name: {{ HOSTNAME_CTL03 }}
+# retry: {count: 1, delay: 30}
+# skip_fail: false
- description: Create partitions 01
cmd: salt-call cmd.run 'pvcreate /dev/vdb1'
@@ -349,11 +349,11 @@
retry: {count: 1, delay: 30}
skip_fail: false
-- description: Temporary WR set enabled backends value 03
- cmd: salt-call cmd.run 'crudini --verbose --set /etc/cinder/cinder.conf DEFAULT enabled_backends lvm'
- node_name: {{ HOSTNAME_CTL03 }}
- retry: {count: 1, delay: 30}
- skip_fail: false
+#- description: Temporary WR set enabled backends value 03
+# cmd: salt-call cmd.run 'crudini --verbose --set /etc/cinder/cinder.conf DEFAULT enabled_backends lvm'
+# node_name: {{ HOSTNAME_CTL03 }}
+# retry: {count: 1, delay: 30}
+# skip_fail: false
- description: Install docker.io on gtw
cmd: salt-call cmd.run 'apt-get install docker.io -y'
diff --git a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/salt.yaml b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/salt.yaml
index 47dfc5e..eff7e90 100644
--- a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/salt.yaml
+++ b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/salt.yaml
@@ -28,20 +28,24 @@
sed -i 's/cluster_name:.*/cluster_name: {{ LAB_CONFIG_NAME }}/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
sed -i 's/cluster_domain:.*/cluster_domain: {{ DOMAIN_NAME }}/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+ # Temporary workaround (with hardcoded address .90 -> .15) of bug https://mirantis.jira.com/browse/PROD-14377
+ sed -i 's/salt_master_address:.*/salt_master_address: {{ SHARED.IPV4_NET_CONTROL_PREFIX }}.15/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+ sed -i 's/salt_master_management_address:.*/salt_master_management_address: {{ SHARED.IPV4_NET_ADMIN_PREFIX }}.15/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+
# Replace firstly to an intermediate value to avoid intersection between
# already replaced and replacing networks.
# For example, if generated IPV4_NET_ADMIN_PREFIX=10.16.0 , then there is a risk of replacing twice:
# 192.168.10 -> 10.16.0 (generated network for admin)
# 10.16.0 -> <external network>
# So let's replace constant networks to the keywords, and then keywords to the desired networks.
- sed -i 's/10\.167\.5\./==IPV4_NET_ADMIN_PREFIX==/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
- sed -i 's/10\.167\.4\./==IPV4_NET_CONTROL_PREFIX==/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
- sed -i 's/10\.167\.6\./==IPV4_NET_TENANT_PREFIX==/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+ sed -i 's/10\.167\.5/==IPV4_NET_ADMIN_PREFIX==/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+ sed -i 's/10\.167\.4/==IPV4_NET_CONTROL_PREFIX==/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+ sed -i 's/10\.167\.6/==IPV4_NET_TENANT_PREFIX==/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
sed -i 's/172\.17\.16\./==IPV4_NET_EXTERNAL_PREFIX==/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
- sed -i 's/==IPV4_NET_ADMIN_PREFIX==/{{ SHARED.IPV4_NET_ADMIN_PREFIX }}./g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
- sed -i 's/==IPV4_NET_CONTROL_PREFIX==/{{ SHARED.IPV4_NET_CONTROL_PREFIX }}./g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
- sed -i 's/==IPV4_NET_TENANT_PREFIX==/{{ SHARED.IPV4_NET_TENANT_PREFIX }}./g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+ sed -i 's/==IPV4_NET_ADMIN_PREFIX==/{{ SHARED.IPV4_NET_ADMIN_PREFIX }}/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+ sed -i 's/==IPV4_NET_CONTROL_PREFIX==/{{ SHARED.IPV4_NET_CONTROL_PREFIX }}/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
+ sed -i 's/==IPV4_NET_TENANT_PREFIX==/{{ SHARED.IPV4_NET_TENANT_PREFIX }}/g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
sed -i 's/==IPV4_NET_EXTERNAL_PREFIX==/{{ SHARED.IPV4_NET_EXTERNAL_PREFIX }}./g' /tmp/cookiecutter-templates/contexts/openstack_ovs_dvr_vxlan.yml
for i in $(ls /tmp/cookiecutter-templates/cluster_product/); do
diff --git a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
index 905842d..8c75753 100644
--- a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml
@@ -31,6 +31,9 @@
- sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
- sudo resolvconf -u
+ # Enable grub menu using updated config below
+ - update-grub
+
# Prepare network connection
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
@@ -72,6 +75,12 @@
########################################################
write_files:
+ - path: /etc/default/grub.d/97-enable-grub-menu.cfg
+ content: |
+ GRUB_RECORDFAIL_TIMEOUT=30
+ GRUB_TIMEOUT=3
+ GRUB_TIMEOUT_STYLE=menu
+
- path: /etc/network/interfaces
content: |
auto ens3
diff --git a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cicd.yaml b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cicd.yaml
new file mode 100644
index 0000000..3bc891d
--- /dev/null
+++ b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cicd.yaml
@@ -0,0 +1,94 @@
+| # All the data below will be stored as a string object
+ #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
+
+ ssh_pwauth: True
+ users:
+ - name: root
+ sudo: ALL=(ALL) NOPASSWD:ALL
+ shell: /bin/bash
+ ssh_authorized_keys:
+ {% for key in config.underlay.ssh_keys %}
+ - ssh-rsa {{ key['public'] }}
+ {% endfor %}
+
+ disable_root: false
+ chpasswd:
+ list: |
+ root:r00tme
+ expire: False
+
+ bootcmd:
+ # Block access to SSH while node is preparing
+ - cloud-init-per once sudo iptables -A INPUT -p tcp --dport 22 -j DROP
+ # Enable root access
+ - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
+ - service sshd restart
+ output:
+ all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
+
+ runcmd:
+ - export TERM=linux
+ - export LANG=C
+ # Configure dhclient
+ - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
+ - sudo resolvconf -u
+
+ # Enable grub menu using updated config below
+ - update-grub
+
+ # Prepare network connection
+ # WARNING! On CID* nodes, admin network is connected to ens4, and control network to ens3 (as in the model)
+ # On other nodes (cfg01 and openstack), admin network is connected to ens3, and control network to ens4
+ - sudo ifup ens4
+
+ # Create swap
+ - fallocate -l 8G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+
+
+ ############## TCP Cloud cfg01 node ##################
+ #- sleep 120
+ - echo "Preparing base OS"
+ - which wget >/dev/null || (apt-get update; apt-get install -y wget)
+
+ - echo "deb [arch=amd64] http://apt.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+ - wget -O - http://apt.mirantis.com/public.gpg | apt-key add -;
+ - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
+ - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
+
+ - apt-get clean
+ - eatmydata apt-get update && apt-get -y upgrade
+
+ # Install common packages
+ - eatmydata apt-get install -y python-pip git curl tmux byobu iputils-ping traceroute htop tree mc
+
+ # Install salt-minion and stop it until it is configured
+ - eatmydata apt-get install -y salt-minion && service salt-minion stop
+
+ # Install latest kernel
+ - eatmydata apt-get install -y linux-generic-hwe-16.04
+
+ ########################################################
+ # Node is ready, allow SSH access
+ #- echo "Allow SSH access ..."
+ #- sudo iptables -D INPUT -p tcp --dport 22 -j DROP
+ - reboot
+ ########################################################
+
+ write_files:
+ - path: /etc/default/grub.d/97-enable-grub-menu.cfg
+ content: |
+ GRUB_RECORDFAIL_TIMEOUT=30
+ GRUB_TIMEOUT=3
+ GRUB_TIMEOUT_STYLE=menu
+
+ - path: /etc/network/interfaces
+ content: |
+ auto ens3
+ iface ens3 inet manual
+ auto ens4
+ iface ens4 inet dhcp
+
diff --git a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
index e6ceb1a..410a639 100644
--- a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
@@ -33,6 +33,9 @@
- sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
- sudo resolvconf -u
+ # Enable grub menu using updated config below
+ - update-grub
+
# Prepare network connection
- sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
@@ -65,13 +68,23 @@
# Install salt-minion and stop it until it is configured
- eatmydata apt-get install -y salt-minion && service salt-minion stop
+ # Install latest kernel
+ - eatmydata apt-get install -y linux-generic-hwe-16.04
+
########################################################
# Node is ready, allow SSH access
- - echo "Allow SSH access ..."
- - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
+ #- echo "Allow SSH access ..."
+ #- sudo iptables -D INPUT -p tcp --dport 22 -j DROP
+ - reboot
########################################################
write_files:
+ - path: /etc/default/grub.d/97-enable-grub-menu.cfg
+ content: |
+ GRUB_RECORDFAIL_TIMEOUT=30
+ GRUB_TIMEOUT=3
+ GRUB_TIMEOUT_STYLE=menu
+
- path: /etc/network/interfaces
content: |
auto ens3
diff --git a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay.yaml b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay.yaml
index af1062f..d092a06 100644
--- a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay.yaml
+++ b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay.yaml
@@ -4,19 +4,29 @@
{% set LAB_CONFIG_NAME = os_env('LAB_CONFIG_NAME', 'virtual-mcp-ocata-dvr') %}
{% set DOMAIN_NAME = os_env('DOMAIN_NAME', LAB_CONFIG_NAME) + '.local' %}
{% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
+{% set HOSTNAME_CID01 = os_env('HOSTNAME_CID01', 'cid01.' + DOMAIN_NAME) %}
+{% set HOSTNAME_CID02 = os_env('HOSTNAME_CID02', 'cid02.' + DOMAIN_NAME) %}
+{% set HOSTNAME_CID03 = os_env('HOSTNAME_CID03', 'cid03.' + DOMAIN_NAME) %}
+{% set HOSTNAME_KVM01 = os_env('HOSTNAME_KVM01', 'kvm01.' + DOMAIN_NAME) %}
+{% set HOSTNAME_KVM02 = os_env('HOSTNAME_KVM02', 'kvm02.' + DOMAIN_NAME) %}
+{% set HOSTNAME_KVM03 = os_env('HOSTNAME_KVM03', 'kvm03.' + DOMAIN_NAME) %}
{% set HOSTNAME_CTL01 = os_env('HOSTNAME_CTL01', 'ctl01.' + DOMAIN_NAME) %}
{% set HOSTNAME_CTL02 = os_env('HOSTNAME_CTL02', 'ctl02.' + DOMAIN_NAME) %}
{% set HOSTNAME_CTL03 = os_env('HOSTNAME_CTL03', 'ctl03.' + DOMAIN_NAME) %}
+{% set HOSTNAME_DBS01 = os_env('HOSTNAME_DBS01', 'dbs01.' + DOMAIN_NAME) %}
+{% set HOSTNAME_DBS02 = os_env('HOSTNAME_DBS02', 'dbs02.' + DOMAIN_NAME) %}
+{% set HOSTNAME_DBS03 = os_env('HOSTNAME_DBS03', 'dbs03.' + DOMAIN_NAME) %}
+{% set HOSTNAME_MSG01 = os_env('HOSTNAME_MSG01', 'msg01.' + DOMAIN_NAME) %}
+{% set HOSTNAME_MSG02 = os_env('HOSTNAME_MSG02', 'msg02.' + DOMAIN_NAME) %}
+{% set HOSTNAME_MSG03 = os_env('HOSTNAME_MSG03', 'msg03.' + DOMAIN_NAME) %}
{% set HOSTNAME_CMP01 = os_env('HOSTNAME_CMP01', 'cmp001.' + DOMAIN_NAME) %}
{% set HOSTNAME_CMP02 = os_env('HOSTNAME_CMP02', 'cmp002.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MON01 = os_env('HOSTNAME_MON01', 'mon01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MON02 = os_env('HOSTNAME_MON02', 'mon02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MON03 = os_env('HOSTNAME_MON03', 'mon03.' + DOMAIN_NAME) %}
{% set HOSTNAME_GTW01 = os_env('HOSTNAME_GTW01', 'gtw01.' + DOMAIN_NAME) %}
{% set HOSTNAME_PRX01 = os_env('HOSTNAME_PRX01', 'prx01.' + DOMAIN_NAME) %}
{% import 'cookieshape-mcp-ocata-dvr-vxlan/underlay--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
{% import 'cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
+{% import 'cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data-cicd.yaml' as CLOUDINIT_USER_DATA_CICD with context %}
{% import 'cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 with context %}
---
@@ -24,6 +34,7 @@
- &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
- &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
- &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
+ - &cloudinit_user_data_cicd {{ CLOUDINIT_USER_DATA_CICD }}
- &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
template:
@@ -37,7 +48,18 @@
ip_reserved:
gateway: +1
l2_network_device: +1
- default_{{ HOSTNAME_CFG01 }}: +90
+ default_{{ HOSTNAME_CFG01 }}: +15
+
+ default_{{ HOSTNAME_CID }}: +90
+ default_{{ HOSTNAME_CID01 }}: +91
+ default_{{ HOSTNAME_CID02 }}: +92
+ default_{{ HOSTNAME_CID03 }}: +93
+
+ default_{{ HOSTNAME_KVM }}: +240
+ default_{{ HOSTNAME_KVM01 }}: +241
+ default_{{ HOSTNAME_KVM02 }}: +242
+ default_{{ HOSTNAME_KVM03 }}: +243
+
default_{{ HOSTNAME_CTL }}: +10
default_{{ HOSTNAME_CTL01 }}: +11
default_{{ HOSTNAME_CTL02 }}: +12
@@ -66,10 +88,6 @@
default_{{ HOSTNAME_LOG01 }}: +61
default_{{ HOSTNAME_LOG02 }}: +62
default_{{ HOSTNAME_LOG03 }}: +63
- default_{{ HOSTNAME_MON }}: +70
- default_{{ HOSTNAME_MON01 }}: +71
- default_{{ HOSTNAME_MON02 }}: +72
- default_{{ HOSTNAME_MON03 }}: +73
default_{{ HOSTNAME_MTR }}: +85
default_{{ HOSTNAME_MTR01 }}: +86
default_{{ HOSTNAME_MTR02 }}: +87
@@ -86,7 +104,18 @@
ip_reserved:
gateway: +1
l2_network_device: +1
- default_{{ HOSTNAME_CFG01 }}: +90
+ default_{{ HOSTNAME_CFG01 }}: +15
+
+ default_{{ HOSTNAME_CID }}: +90
+ default_{{ HOSTNAME_CID01 }}: +91
+ default_{{ HOSTNAME_CID02 }}: +92
+ default_{{ HOSTNAME_CID03 }}: +93
+
+ default_{{ HOSTNAME_KVM }}: +240
+ default_{{ HOSTNAME_KVM01 }}: +241
+ default_{{ HOSTNAME_KVM02 }}: +242
+ default_{{ HOSTNAME_KVM03 }}: +243
+
default_{{ HOSTNAME_CTL }}: +10
default_{{ HOSTNAME_CTL01 }}: +11
default_{{ HOSTNAME_CTL02 }}: +12
@@ -115,10 +144,7 @@
default_{{ HOSTNAME_LOG01 }}: +61
default_{{ HOSTNAME_LOG02 }}: +62
default_{{ HOSTNAME_LOG03 }}: +63
- default_{{ HOSTNAME_MON }}: +70
- default_{{ HOSTNAME_MON01 }}: +71
- default_{{ HOSTNAME_MON02 }}: +72
- default_{{ HOSTNAME_MON03 }}: +73
+
default_{{ HOSTNAME_MTR }}: +85
default_{{ HOSTNAME_MTR01 }}: +86
default_{{ HOSTNAME_MTR02 }}: +87
@@ -135,7 +161,18 @@
ip_reserved:
gateway: +1
l2_network_device: +1
- default_{{ HOSTNAME_CFG01 }}: +90
+ default_{{ HOSTNAME_CFG01 }}: +15
+
+ default_{{ HOSTNAME_CID }}: +90
+ default_{{ HOSTNAME_CID01 }}: +91
+ default_{{ HOSTNAME_CID02 }}: +92
+ default_{{ HOSTNAME_CID03 }}: +93
+
+ default_{{ HOSTNAME_KVM }}: +240
+ default_{{ HOSTNAME_KVM01 }}: +241
+ default_{{ HOSTNAME_KVM02 }}: +242
+ default_{{ HOSTNAME_KVM03 }}: +243
+
default_{{ HOSTNAME_CTL }}: +10
default_{{ HOSTNAME_CTL01 }}: +11
default_{{ HOSTNAME_CTL02 }}: +12
@@ -164,10 +201,6 @@
default_{{ HOSTNAME_LOG01 }}: +61
default_{{ HOSTNAME_LOG02 }}: +62
default_{{ HOSTNAME_LOG03 }}: +63
- default_{{ HOSTNAME_MON }}: +70
- default_{{ HOSTNAME_MON01 }}: +71
- default_{{ HOSTNAME_MON02 }}: +72
- default_{{ HOSTNAME_MON03 }}: +73
default_{{ HOSTNAME_MTR }}: +85
default_{{ HOSTNAME_MTR01 }}: +86
default_{{ HOSTNAME_MTR02 }}: +87
@@ -184,7 +217,18 @@
ip_reserved:
gateway: +1
l2_network_device: +1
- default_{{ HOSTNAME_CFG01 }}: +90
+ default_{{ HOSTNAME_CFG01 }}: +15
+
+ default_{{ HOSTNAME_CID }}: +90
+ default_{{ HOSTNAME_CID01 }}: +91
+ default_{{ HOSTNAME_CID02 }}: +92
+ default_{{ HOSTNAME_CID03 }}: +93
+
+ default_{{ HOSTNAME_KVM }}: +240
+ default_{{ HOSTNAME_KVM01 }}: +241
+ default_{{ HOSTNAME_KVM02 }}: +242
+ default_{{ HOSTNAME_KVM03 }}: +243
+
default_{{ HOSTNAME_CTL }}: +10
default_{{ HOSTNAME_CTL01 }}: +11
default_{{ HOSTNAME_CTL02 }}: +12
@@ -213,10 +257,6 @@
default_{{ HOSTNAME_LOG01 }}: +61
default_{{ HOSTNAME_LOG02 }}: +62
default_{{ HOSTNAME_LOG03 }}: +63
- default_{{ HOSTNAME_MON }}: +70
- default_{{ HOSTNAME_MON01 }}: +71
- default_{{ HOSTNAME_MON02 }}: +72
- default_{{ HOSTNAME_MON03 }}: +73
default_{{ HOSTNAME_MTR }}: +85
default_{{ HOSTNAME_MTR01 }}: +86
default_{{ HOSTNAME_MTR02 }}: +87
@@ -280,7 +320,7 @@
role: salt_master
params:
vcpu: !os_env SLAVE_NODE_CPU, 2
- memory: !os_env SLAVE_NODE_MEMORY, 2048
+ memory: !os_env SLAVE_NODE_MEMORY, 3072
boot:
- hd
cloud_init_volume_name: iso
@@ -314,7 +354,7 @@
networks:
- private
- - name: {{ HOSTNAME_CTL01 }}
+ - name: {{ HOSTNAME_CID01 }}
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 2
@@ -322,15 +362,103 @@
boot:
- hd
cloud_init_volume_name: iso
+ cloud_init_iface_up: ens4
+ volumes:
+ - name: system
+ capacity: !os_env NODE_VOLUME_SIZE, 150
+ backing_store: cloudimage1604
+ 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_cicd
+
+ interfaces: &cid_interfaces
+ - label: ens3
+ l2_network_device: private
+ interface_model: *interface_model
+ - label: ens4
+ l2_network_device: admin
+ interface_model: *interface_model
+ network_config: &cid_network_config
+ ens3:
+ networks:
+ - private
+ ens4:
+ networks:
+ - admin
+
+# - name: {{ HOSTNAME_CID02 }}
+# role: salt_minion
+# params:
+## vcpu: !os_env SLAVE_NODE_CPU, 2
+# memory: !os_env SLAVE_NODE_MEMORY, 6144
+# boot:
+# - hd
+# cloud_init_volume_name: iso
+# cloud_init_iface_up: ens4
+# volumes:
+# - name: system
+# capacity: !os_env NODE_VOLUME_SIZE, 150
+# backing_store: cloudimage1604
+# 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_cicd
+#
+# interfaces: *cid_interfaces
+# network_config: *cid_network_config
+
+# - name: {{ HOSTNAME_CID03 }}
+# role: salt_minion
+# params:
+# vcpu: !os_env SLAVE_NODE_CPU, 2
+# memory: !os_env SLAVE_NODE_MEMORY, 6144
+# boot:
+# - hd
+# cloud_init_volume_name: iso
+# cloud_init_iface_up: ens4
+# volumes:
+# - name: system
+# capacity: !os_env NODE_VOLUME_SIZE, 150
+# backing_store: cloudimage1604
+# 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_cicd
+#
+# interfaces: *cid_interfaces
+# network_config: *cid_network_config
+
+ # KVM* nodes required for services like glusterfs.server
+ - name: {{ HOSTNAME_KVM01 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 1
+ 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: cinder
- capacity: 50
- format: qcow2
- name: iso # Volume with name 'iso' will be used
# for store image with cloud-init metadata.
capacity: 1
@@ -355,15 +483,252 @@
networks:
- private
+ - name: {{ HOSTNAME_KVM02 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 1
+ 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: 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_KVM03 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 1
+ 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: 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_DBS01 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 1
+ memory: !os_env SLAVE_NODE_MEMORY, 6144
+ boot:
+ - hd
+ cloud_init_volume_name: iso
+ cloud_init_iface_up: ens4
+ volumes:
+ - name: system
+ capacity: !os_env NODE_VOLUME_SIZE, 150
+ backing_store: cloudimage1604
+ 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_cicd
+
+ interfaces: *cid_interfaces
+ network_config: *cid_network_config
+
+ - name: {{ HOSTNAME_DBS02 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 1
+ memory: !os_env SLAVE_NODE_MEMORY, 6144
+ boot:
+ - hd
+ cloud_init_volume_name: iso
+ cloud_init_iface_up: ens4
+ volumes:
+ - name: system
+ capacity: !os_env NODE_VOLUME_SIZE, 150
+ backing_store: cloudimage1604
+ 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_cicd
+
+ interfaces: *cid_interfaces
+ network_config: *cid_network_config
+
+ - name: {{ HOSTNAME_DBS03 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 1
+ memory: !os_env SLAVE_NODE_MEMORY, 6144
+ boot:
+ - hd
+ cloud_init_volume_name: iso
+ cloud_init_iface_up: ens4
+ volumes:
+ - name: system
+ capacity: !os_env NODE_VOLUME_SIZE, 150
+ backing_store: cloudimage1604
+ 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_cicd
+
+ interfaces: *cid_interfaces
+ network_config: *cid_network_config
+
+ - name: {{ HOSTNAME_MSG01 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 1
+ memory: !os_env SLAVE_NODE_MEMORY, 4096
+ boot:
+ - hd
+ cloud_init_volume_name: iso
+ cloud_init_iface_up: ens4
+ volumes:
+ - name: system
+ capacity: !os_env NODE_VOLUME_SIZE, 150
+ backing_store: cloudimage1604
+ 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_cicd
+
+ interfaces: *cid_interfaces
+ network_config: *cid_network_config
+
+# - name: {{ HOSTNAME_MSG02 }}
+# role: salt_minion
+# params:
+# vcpu: !os_env SLAVE_NODE_CPU, 1
+# memory: !os_env SLAVE_NODE_MEMORY, 2048
+# boot:
+# - hd
+# cloud_init_volume_name: iso
+# cloud_init_iface_up: ens4
+# volumes:
+# - name: system
+# capacity: !os_env NODE_VOLUME_SIZE, 150
+# backing_store: cloudimage1604
+# 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_cicd
+#
+# interfaces: *cid_interfaces
+# network_config: *cid_network_config
+
+# - name: {{ HOSTNAME_MSG03 }}
+# role: salt_minion
+# params:
+# vcpu: !os_env SLAVE_NODE_CPU, 1
+# memory: !os_env SLAVE_NODE_MEMORY, 2048
+# boot:
+# - hd
+# cloud_init_volume_name: iso
+# cloud_init_iface_up: ens4
+# volumes:
+# - name: system
+# capacity: !os_env NODE_VOLUME_SIZE, 150
+# backing_store: cloudimage1604
+# 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_cicd
+#
+# interfaces: *cid_interfaces
+# network_config: *cid_network_config
+
+ - name: {{ HOSTNAME_CTL01 }}
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 2
+ memory: !os_env SLAVE_NODE_MEMORY, 6144
+ boot:
+ - hd
+ cloud_init_volume_name: iso
+ cloud_init_iface_up: ens4
+ volumes:
+ - name: system
+ capacity: !os_env NODE_VOLUME_SIZE, 150
+ backing_store: cloudimage1604
+ format: qcow2
+ - name: cinder
+ 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_cicd
+
+ interfaces: *cid_interfaces
+ network_config: *cid_network_config
+
- name: {{ HOSTNAME_CTL02 }}
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 2
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ memory: !os_env SLAVE_NODE_MEMORY, 6144
boot:
- hd
cloud_init_volume_name: iso
- cloud_init_iface_up: ens3
+ cloud_init_iface_up: ens4
volumes:
- name: system
capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -379,127 +744,49 @@
device: cdrom
bus: ide
cloudinit_meta_data: *cloudinit_meta_data
- cloudinit_user_data: *cloudinit_user_data_1604
+ cloudinit_user_data: *cloudinit_user_data_cicd
- interfaces: *interfaces
- network_config: *network_config
+ interfaces: *cid_interfaces
+ network_config: *cid_network_config
- - name: {{ HOSTNAME_CTL03 }}
- role: salt_minion
- params:
- vcpu: !os_env SLAVE_NODE_CPU, 2
- memory: !os_env SLAVE_NODE_MEMORY, 8192
- 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: cinder
- 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_MON01 }}
- role: salt_minion
- params:
- vcpu: !os_env SLAVE_NODE_CPU, 3
- 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: 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: !include underlay--meta-data.yaml
- cloudinit_user_data: !include underlay--user-data1604.yaml
-
- interfaces: *interfaces
- network_config: *network_config
-
- - name: {{ HOSTNAME_MON02 }}
- role: salt_minion
- params:
- vcpu: !os_env SLAVE_NODE_CPU, 3
- 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: 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: !include underlay--meta-data.yaml
- cloudinit_user_data: !include underlay--user-data1604.yaml
-
- interfaces: *interfaces
- network_config: *network_config
-
- - name: {{ HOSTNAME_MON03 }}
- role: salt_minion
- params:
- vcpu: !os_env SLAVE_NODE_CPU, 3
- 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: 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: !include underlay--meta-data.yaml
- cloudinit_user_data: !include underlay--user-data1604.yaml
-
- interfaces: *interfaces
- network_config: *network_config
+# - name: {{ HOSTNAME_CTL03 }}
+# role: salt_minion
+# params:
+# vcpu: !os_env SLAVE_NODE_CPU, 2
+# memory: !os_env SLAVE_NODE_MEMORY, 6144
+# boot:
+# - hd
+# cloud_init_volume_name: iso
+# cloud_init_iface_up: ens4
+# volumes:
+# - name: system
+# capacity: !os_env NODE_VOLUME_SIZE, 150
+# backing_store: cloudimage1604
+# format: qcow2
+# - name: cinder
+# 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_cicd
+#
+# interfaces: *cid_interfaces
+# network_config: *cid_network_config
- name: {{ HOSTNAME_PRX01 }}
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 1
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ memory: !os_env SLAVE_NODE_MEMORY, 2048
boot:
- hd
cloud_init_volume_name: iso
- cloud_init_iface_up: ens3
+ cloud_init_iface_up: ens4
volumes:
- name: system
capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -515,17 +802,16 @@
device: cdrom
bus: ide
cloudinit_meta_data: *cloudinit_meta_data
- cloudinit_user_data: *cloudinit_user_data_1604
+ cloudinit_user_data: *cloudinit_user_data_cicd
- interfaces: *interfaces
- network_config: *network_config
-
+ interfaces: *cid_interfaces
+ network_config: *cid_network_config
- name: {{ HOSTNAME_CMP01 }}
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 3
- memory: !os_env SLAVE_NODE_MEMORY, 4096
+ memory: !os_env SLAVE_NODE_MEMORY, 3072
boot:
- hd
cloud_init_volume_name: iso
@@ -576,7 +862,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 3
- memory: !os_env SLAVE_NODE_MEMORY, 4096
+ memory: !os_env SLAVE_NODE_MEMORY, 3072
boot:
- hd
cloud_init_volume_name: iso
@@ -601,7 +887,7 @@
- name: {{ HOSTNAME_GTW01 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 1
+ vcpu: !os_env SLAVE_NODE_CPU, 2
memory: !os_env SLAVE_NODE_MEMORY, 2048
boot:
- hd