commit d81aae993910e472b476384d9e6d51649e04822a
author Dennis Dmitriev <ddmitriev@mirantis.com> Mon Jul 10 15:52:30 2017 +0300
committer Denis Dmitriev <ddmitriev@mirantis.com> Wed Jul 12 20:30:45 2017 +0000
tree 20de6a8caa6e62cb685d60afdab387d00a2d0711
parent f429d85671c1359633f0656990f1a509f06630cf

Update ocata-cicd model according to changes in cookiecutter

Changes taken from:
cicd: https://gerrit.mcp.mirantis.net/#/c/6751/2
stacklight: taken from virtual-mcp11-k8s-calico/stacklight

Change-Id: I9fa7a0ab76f943b96293584b3f52765965f3b906

classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml

diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
index 88b9b0f..c04387f 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
@@ -21,11 +21,11 @@
 - 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.stacklight_server_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.cicd_control_cluster
 - cluster.virtual-mcp-ocata-cicd.openstack.proxy
 - cluster.virtual-mcp-ocata-cicd.stacklight.proxy
-- cluster.virtual-mcp-ocata-cicd
-- system.reclass.storage.system.cicd_control_cluster
+- cluster.virtual-mcp-ocata-cicd.infra
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab

classes/cluster/virtual-mcp-ocata-cicd/infra/init.yml

diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/init.yml
index 9140bd0..93014c8 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/infra/init.yml
@@ -1,6 +1,33 @@
+classes:
+- system.linux.system.single
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.ubuntu
+- system.openssh.server.team.lab
+- system.openssh.server.team.stacklight
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.rsyslog.client.single
+- cluster.virtual-mcp-ocata-cicd.cicd
+- cluster.virtual-mcp-ocata-cicd.openstack
+- cluster.virtual-mcp-ocata-cicd.stacklight
+- cluster.overrides
 parameters:
+  _param:
+    cluster_domain: virtual-mcp-ocata-cicd.local
+    cluster_name: virtual-mcp-ocata-cicd
+    # infra service addresses
+    infra_config_hostname: cfg01
+    infra_config_address: 172.16.10.100
+
+    salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
+    salt_minion_ca_authority: salt_master_ca
   linux:
     network:
+      resolv:
+        dns:
+          - 172.18.176.4
+          - 172.18.208.44
       host:
         cfg01:
           address: ${_param:infra_config_address}