| commit | ce5bfc5d5165608d4f9e874cd91d6d93d492da01 | [log] [tgz] |
|---|---|---|
| author | Adam Tengler <atengler@mirantis.com> | Fri Aug 04 12:43:19 2017 +0000 |
| committer | Adam Tengler <atengler@mirantis.com> | Fri Aug 04 12:44:05 2017 +0000 |
| tree | f7a2dca24e080d61ab7debef310235f5137b6bfe | |
| parent | 791cb62e84ecd8c10be3a3bc765a0e26b00e8b05 [diff] |
Drivetrain HA model fixes Change-Id: I1500fefb25bf223d89461cbd0119beb7a1d29f71
diff --git a/classes/cluster/drivetrain_ha/cicd/control/init.yml b/classes/cluster/drivetrain_ha/cicd/control/init.yml index 619db7b..a8977d6 100644 --- a/classes/cluster/drivetrain_ha/cicd/control/init.yml +++ b/classes/cluster/drivetrain_ha/cicd/control/init.yml
@@ -90,7 +90,7 @@ # Rundeck - system.rundeck.client.runbook - # - cluster.drivetrain_ha.cicd + - cluster.drivetrain_ha.cicd # - cluster.drivetrain_ha parameters: _param: @@ -110,6 +110,8 @@ cluster_public_host: ${_param:control_public_host} glusterfs_service_host: ${_param:control_vip_address} + admin_email: root@localhost + # Haproxy SSL configuration cluster_ssl_certificate: enabled: true
diff --git a/classes/cluster/drivetrain_ha/cicd/control/master.yml b/classes/cluster/drivetrain_ha/cicd/control/master.yml index 6d93273..4437b9e 100644 --- a/classes/cluster/drivetrain_ha/cicd/control/master.yml +++ b/classes/cluster/drivetrain_ha/cicd/control/master.yml
@@ -43,4 +43,4 @@ # ..projects - system.rundeck.client.project.cicd # At last - - cluster.drivetrain_ha.cicd.control + - cluster.drivetrain_ha
diff --git a/classes/cluster/drivetrain_ha/cicd/control/slave.yml b/classes/cluster/drivetrain_ha/cicd/control/slave.yml index a3a289a..bdc7137 100644 --- a/classes/cluster/drivetrain_ha/cicd/control/slave.yml +++ b/classes/cluster/drivetrain_ha/cicd/control/slave.yml
@@ -1,3 +1,3 @@ classes: - - cluster.drivetrain_ha.cicd.control - - system.docker.swarm.manager +- system.docker.swarm.manager +- cluster.drivetrain_ha