Add LMA2.0
* Align current model with use LMA2.0 aproach
* Delete linux_system_codename from openstack/control.yml, proxy.yaml,
as it defined in infra/config.yml
Change-Id: I3afd56a511f67f91dbda1af157407aeabb15c717
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
index 6d80e49..7a25b90 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
@@ -5,7 +5,8 @@
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
-- system.heka.alarm.openstack_compute
+- system.ceilometer.agent.cluster
+- system.prometheus.exporters.libvirt
- cluster.virtual-mcp-ocata-ovs
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index 73cb2f4..cc036af 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -14,17 +14,22 @@
- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.prometheus
- system.glusterfs.server.cluster
- system.glance.control.cluster
-- system.heka.alarm.openstack_control
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
- system.designate.server.cluster
- system.designate.server.backend.bind
- system.bind.server.single
- system.galera.server.cluster
+- system.galera.server.database.aodh
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
@@ -39,7 +44,6 @@
_param:
keepalived_vip_interface: ens4
keepalived_openstack_telemetry_vip_interface: ens4
- linux_system_codename: xenial
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index 46f4365..749372c 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -71,6 +71,8 @@
ceilometer_service_host: 172.16.10.108
cinder_version: ${_param:openstack_version}
cinder_service_host: ${_param:cluster_vip_address}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:cluster_vip_address}
ceilometer_graphite_publisher_host: 172.16.10.107
ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
@@ -96,6 +98,7 @@
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_ceilometer_password: workshop
+ keystone_aodh_password: workshop
keystone_cinder_password: workshop
keystone_glance_password: workshop
keystone_heat_password: workshop
@@ -114,6 +117,7 @@
mongodb_ceilometer_password: cloudlab
mongodb_admin_password: cloudlab
mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+ ceilometer_influxdb_password: lmapass
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
index e38110b..93bfd56 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
@@ -7,7 +7,6 @@
- cluster.virtual-mcp-ocata-ovs
parameters:
_param:
- linux_system_codename: xenial
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}