Add cid nodes into offline pike dpdk
Change-Id: I8c08f0f674537b6215b82f5b4b4edec76adb1b0b
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 6f58513..645612b 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -4,12 +4,17 @@
- system.linux.system.single.debian
- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-#- system.openssh.client.lab
+- system.linux.system.repo_local.mcp.salt
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.percona
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.glusterfs
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.salt_pki
- system.salt.master.pkg
- system.salt.master.api
- system.salt.master.formula.pkg.gnocchi
- system.salt.master.formula.pkg.panko
-- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
- system.keystone.client.single
@@ -23,14 +28,19 @@
- system.keystone.client.service.gnocchi
- system.gnocchi.client
- system.gnocchi.client.v1.archive_policy.default
+- system.reclass.storage.salt
- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.openstack_telemetry_cluster
+- system.reclass.storage.system.cicd_control_cluster
+- service.jenkins.client
+- system.jenkins.client.credential.salt
+- system.jenkins.client.job.deploy.openstack
+- cluster.virtual-offline-pike-ovs-dpdk.infra
- cluster.virtual-offline-pike-ovs-dpdk.infra.backup.client_common
-- cluster.virtual-offline-pike-ovs-dpdk
parameters:
_param:
reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
@@ -41,7 +51,12 @@
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
- salt_minion_ca_host: ${linux:network:fqdn}
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ jenkins_git_url: 'git@cfg01:/home/repo'
+ jenkins_gerrit_url: ${_param:jenkins_git_url}
+ salt_api_password: 'hovno12345!'
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins_pipeline_library_url: git@cfg01:/home/repo/mcp-ci/pipeline-library
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
linux:
network:
@@ -52,6 +67,19 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
+ jenkins:
+ client:
+ lib:
+ pipeline-library:
+ url: ${_param:jenkins_pipeline_library_url}
+ branch: ${_param:jenkins_pipelines_branch}
+ master:
+ host: ${_param:salt_master_host}
+ port: 8081
+ password: r00tme
+ globalenvprop:
+ OFFLINE_DEPLOYMENT:
+ value: "true"
salt:
master:
backup: true
@@ -163,6 +191,21 @@
cluster_param:
openstack_telemetry_node03_address:
value_template: <<node_control_ip>>
+ cicd_control_node01:
+ expression: <<node_hostname>>__equals__cid01
+ cluster_param:
+ cicd_control_node01_address:
+ value_template: <<node_control_ip>>
+ cicd_control_node02:
+ expression: <<node_hostname>>__equals__cid02
+ cluster_param:
+ cicd_control_node02_address:
+ value_template: <<node_control_ip>>
+ cicd_control_node03:
+ expression: <<node_hostname>>__equals__cid03
+ cluster_param:
+ cicd_control_node03_address:
+ value_template: <<node_control_ip>>
node:
openstack_control_node01:
classes: