commit 886abd4ea860a81632325bb6f09ac19afd8d59cd
author Richard Felkl <rfelkl@mirantis.com> Thu Aug 24 10:56:33 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Thu Aug 24 10:56:35 2017 +0000
tree fb70036e46a7ee34899a295d75579a750fac3ba0
parent dfda8b47a15b197b1168410c766f79654837ebb4
parent 2b78d8cd716440bab5a697068d4315f066c43736

Merge "fixes for sl_os_contrail cluster model"

classes/cluster/ceph_ha/infra/config.yml

diff --git a/classes/cluster/ceph_ha/infra/config.yml b/classes/cluster/ceph_ha/infra/config.yml
index 806bbce..123cb65 100644
--- a/classes/cluster/ceph_ha/infra/config.yml
+++ b/classes/cluster/ceph_ha/infra/config.yml
@@ -87,7 +87,7 @@
             ceph_osd_node03_address:
               value_template: <<node_control_ip>>
         ceph_mon_01:
-          expression: <<node_hostname>>__equals__cmn03
+          expression: <<node_hostname>>__equals__cmn01
           cluster_param:
             ceph_mon_node01_address:
               value_template: <<node_control_ip>>

classes/cluster/model_manager/model_manager/init.yml

diff --git a/classes/cluster/model_manager/model_manager/init.yml b/classes/cluster/model_manager/model_manager/init.yml
index 0e5dded..781d1f4 100644
--- a/classes/cluster/model_manager/model_manager/init.yml
+++ b/classes/cluster/model_manager/model_manager/init.yml
@@ -14,6 +14,7 @@
     # identity params
     openstack_region: RegionOne
     admin_email: root@localhost
+    openstack_version: mitaka
     keystone_version: mitaka
     keystone_service_token: qzWYJmNiiXYRSipdWda0
     rabbitmq_openstack_password: workshop