| commit | b6703428c55bab6b45bb371c5242e08ca71d32eb | [log] [tgz] |
|---|---|---|
| author | Ondrej Smola <osmola@mirantis.com> | Thu Jan 11 15:05:00 2018 +0000 |
| committer | Gerrit Code Review <gerrit2@e9aa877068d1> | Thu Jan 11 15:05:00 2018 +0000 |
| tree | 92dcdae4c48adca37e06d10a58715f8b4a6b0d30 | |
| parent | a15218447abb6dd8267531433a393c2c4d9810dc [diff] | |
| parent | 547d9247eb90af2ce020bc4e34eea82850b19ab5 [diff] |
Merge "fixed cicd includes for clusters"
diff --git a/classes/cluster/drivetrain-ha/cicd/control/init.yml b/classes/cluster/drivetrain-ha/cicd/control/init.yml index 38fce33..18bf6c5 100644 --- a/classes/cluster/drivetrain-ha/cicd/control/init.yml +++ b/classes/cluster/drivetrain-ha/cicd/control/init.yml
@@ -92,8 +92,6 @@ # Rundeck - system.rundeck.client.runbook - - - cluster.drivetrain-ha.cicd parameters: _param: cluster_name: drivetrain-ha
diff --git a/classes/cluster/drivetrain-ha/cicd/control/master.yml b/classes/cluster/drivetrain-ha/cicd/control/master.yml index 21abc74..40d881e 100644 --- a/classes/cluster/drivetrain-ha/cicd/control/master.yml +++ b/classes/cluster/drivetrain-ha/cicd/control/master.yml
@@ -44,3 +44,4 @@ - system.rundeck.client.project.cicd # At last - cluster.drivetrain-ha + - cluster.drivetrain-ha.cicd.control
diff --git a/classes/cluster/drivetrain-ha/cicd/control/slave.yml b/classes/cluster/drivetrain-ha/cicd/control/slave.yml index 52f21eb..f8c6680 100644 --- a/classes/cluster/drivetrain-ha/cicd/control/slave.yml +++ b/classes/cluster/drivetrain-ha/cicd/control/slave.yml
@@ -1,3 +1,4 @@ classes: - system.docker.swarm.manager - cluster.drivetrain-ha + - cluster.drivetrain-ha.cicd.control \ No newline at end of file
diff --git a/classes/cluster/drivetrain-ha/init.yml b/classes/cluster/drivetrain-ha/init.yml index aa9cb9b..78383a6 100644 --- a/classes/cluster/drivetrain-ha/init.yml +++ b/classes/cluster/drivetrain-ha/init.yml
@@ -6,5 +6,5 @@ - system.linux.system.motd.dynamic - system.openssh.server.team.all - cluster.drivetrain-ha.infra - - cluster.drivetrain-ha.cicd.control + - cluster.drivetrain-ha.cicd - cluster.overrides