commit 271117f79220634c52e179d0e0edb258f5bbce74
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Oct 05 13:18:37 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Oct 05 13:18:37 2018 +0000
tree a3a281bee09f0cce389f0b58e42ba7d99b868602
parent 80a0d503ccb0e809252a558eb6e0b3af1b18824b
parent 758fb092beae8f3560dba2917856ce84fae067de

Merge "Remove glance client images fomr contrail labs"

classes/cluster/os-ha-contrail-40/infra/config.yml

diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index b6f2954..f248234 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -35,8 +35,6 @@
 - system.mysql.client.database.neutron
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
-- system.glance.client.image.cirros
-- system.glance.client.image.ubuntu_xenial
 - system.nova.client.flavor.default
 - cluster.os-ha-contrail-40.openstack.proxy
 - cluster.os-ha-contrail-40

classes/cluster/os-ha-contrail/infra/config.yml

diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index d5d40c0..27daba8 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -37,8 +37,6 @@
 - system.mysql.client.database.neutron
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
-- system.glance.client.image.cirros
-- system.glance.client.image.ubuntu_xenial
 - system.nova.client.flavor.default
 - cluster.os-ha-contrail.openstack.proxy
 - cluster.os-ha-contrail