Merge "/etc/hosts updated"
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>>
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
diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index fd68737..d625393 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -37,7 +37,6 @@
- system.mysql.client.database.neutron
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.opencontrail_control_cluster
-- system.reclass.storage.system.stacklightv2_server_cluster
- cluster.sl_os_contrail.openstack.proxy
- cluster.sl_os_contrail.stacklight.proxy
- cluster.sl_os_contrail.openstack.dashboard
@@ -150,6 +149,7 @@
cluster_param:
stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
+ node:
prx_node:
name: ${_param:openstack_proxy_node01_hostname}
domain: ${_param:cluster_domain}
@@ -163,7 +163,6 @@
name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- - service.galera.master.cluster
- system.docker.swarm.master
- cluster.${_param:cluster_name}.stacklight.client
- cluster.${_param:cluster_name}.stacklight.server
@@ -172,12 +171,10 @@
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 100
- mysql_cluster_role: master
stacklight_monitor_node02:
name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
classes:
- - service.galera.slave.cluster
- system.docker.swarm.manager
- cluster.${_param:cluster_name}.stacklight.server
params:
@@ -185,12 +182,10 @@
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 101
- mysql_cluster_role: slave
stacklight_monitor_node03:
name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
classes:
- - service.galera.slave.cluster
- system.docker.swarm.manager
- cluster.${_param:cluster_name}.stacklight.server
params:
@@ -198,7 +193,6 @@
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 102
- mysql_cluster_role: slave
opencontrail_control_node01:
params:
rabbitmq_cluster_role: master
@@ -207,4 +201,22 @@
rabbitmq_cluster_role: slave
opencontrail_control_node03:
params:
- rabbitmq_cluster_role: slave
\ No newline at end of file
+ rabbitmq_cluster_role: slave
+ openstack_control_node01:
+ classes:
+ - service.galera.master.cluster
+ params:
+ linux_system_codename: xenial
+ mysql_cluster_role: master
+ openstack_control_node02:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ linux_system_codename: xenial
+ mysql_cluster_role: slave
+ openstack_control_node03:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ linux_system_codename: xenial
+ mysql_cluster_role: slave
\ No newline at end of file
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index a4a90b2..819404c 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -80,9 +80,4 @@
elasticsearch:
server:
heap:
- size: 1
- keepalived:
- cluster:
- instance:
- VIP:
- enabled: false
\ No newline at end of file
+ size: 1
\ No newline at end of file