| commit | 4c145ac7da4a661cd42c9670bef503c21216c1a9 | [log] [tgz] |
|---|---|---|
| author | Mykyta Karpin <mkarpin@mirantis.com> | Thu Oct 18 16:32:37 2018 +0300 |
| committer | Mykyta Karpin <mkarpin@mirantis.com> | Tue Oct 23 13:46:32 2018 +0300 |
| tree | 77d075ed06eb5686c614b7ed09028d291070a02f | |
| parent | 066afb8ee916b94ceeef26f06dfa75bd322cb361 [diff] |
Bump reclass to get fresh fixes - system.defaults is required now due to some parameters moving from system classes to syste.defaults - telemetry is aligned with other models Change-Id: Idc2f64a264a0cdcefc0613b2da7c5ba0cacfc9ac
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml b/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml index 5a7314b..19a5a47 100644 --- a/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml +++ b/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml
@@ -1,8 +1,3 @@ classes: - cluster.virtual-mcp11-aio-telemetry -parameters: - linux: - system: - name: cfg01 - domain: ${_param:cluster_domain} - purge_repos: ${_param:linux_system_purge_repos} + - cluster.virtual-mcp11-aio.infra.config
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/init.yml index cd75b17..eec6f65 100755 --- a/classes/cluster/virtual-mcp11-aio-telemetry/init.yml +++ b/classes/cluster/virtual-mcp11-aio-telemetry/init.yml
@@ -1,12 +1,4 @@ classes: -- cluster.virtual-mcp11-aio.infra.config - cluster.virtual-mcp11-aio-telemetry.openstack -- cluster.overrides -parameters: - _param: - cluster_domain: virtual-mcp11-aio-telemetry.local - cluster_name: virtual-mcp11-aio-telemetry - reclass_config_master: 192.168.10.90 - single_address: 172.16.10.90 - infra_config_address: ${_param:single_address} - infra_config_hostname: cfg01 \ No newline at end of file +- cluster.virtual-mcp11-aio +- cluster.overrides \ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml index 0d6b569..34a80c0 100755 --- a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml +++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -25,6 +25,7 @@ - system.ceilometer.server.backend.gnocchi - system.gnocchi.client - system.gnocchi.client.v1.archive_policy.default +- cluster.virtual-mcp11-aio.openstack parameters: _param: cluster_public_protocol: http
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml index 86ac3ee..ae753dc 100755 --- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml +++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -1,4 +1,5 @@ classes: +- system.defaults - system.salt.minion.cert.mysql.server - system.salt.minion.cert.rabbitmq_server - system.linux.system.lowmem