| commit | 4799d61f7a2d3cb9be1921fb1bf80360ed1a2233 | [log] [tgz] |
|---|---|---|
| author | Sergey Novikov <snovikov@mirantis.com> | Mon Sep 25 16:23:37 2017 +0400 |
| committer | Sergey Novikov <snovikov@mirantis.com> | Tue Oct 10 17:39:56 2017 +0400 |
| tree | d58193a7c637c01a7971eebe15fe88823823fcfd | |
| parent | 5d8b6bc9b3a391b31b24e064890280f6002d8ac2 [diff] |
Fix a dual inheritance Change-Id: I09269ee16df4a889c13335e0c5af14015449d4cf
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml index 2ce0ac6..736b251 100644 --- a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml +++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
@@ -91,9 +91,10 @@ # Rundeck - system.rundeck.client.runbook - - cluster.drivetrain-ha-clusters + - cluster.drivetrain-ha-clusters.cicd parameters: _param: + cluster_name: cicd-lab-dev cluster_node01_name: ci01 cluster_node01_address: ${_param:control_node01_address} cluster_node02_name: ci02
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml index dadabbb..b02ce35 100644 --- a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml +++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
@@ -43,4 +43,4 @@ # ..projects - system.rundeck.client.project.cicd # At last - - cluster.drivetrain-ha-clusters.cicd.control + - cluster.drivetrain-ha-clusters
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/slave.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/slave.yml index b5d63e2..415190d 100644 --- a/classes/cluster/drivetrain-ha-clusters/cicd/control/slave.yml +++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/slave.yml
@@ -1,3 +1,3 @@ classes: - - cluster.drivetrain-ha-clusters.cicd.control - system.docker.swarm.manager + - cluster.drivetrain-ha-clusters