diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-07 13:19:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-07 13:19:13 +0000 |
| commit | b466cb8270ebf9515d6acbad4d4dcfe28af47dd6 (patch) | |
| tree | bbba9dc0d30696c1ffecb8caa03f5e1f821e46dc /mcp/reclass/classes/cluster/.gitignore | |
| parent | 9b106457ce0cc0d4d03115ef94c3b386164ea051 (diff) | |
| parent | 291d972bdd666d36e35f8bb3953b0da806ea0eea (diff) | |
Merge changes from topics 'baremetal-noha', 'move-maas-classes'
* changes:
[noha] cinder: Align VG name with HA scenarios
[reclass] Move system.single class to common
[maas] Add reclass storage definitions for all
[reclass] Move MaaS classes to common dir for NOHA
Diffstat (limited to 'mcp/reclass/classes/cluster/.gitignore')
| -rw-r--r-- | mcp/reclass/classes/cluster/.gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index a7efc5744..78eb36c1c 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -3,9 +3,9 @@ all-mcp-arch-common/init.yml all-mcp-arch-common/opnfv/init.yml mcp*common-*/infra/config.yml mcp-common-ha/infra/init.yml -mcp-common-ha/infra/maas.yml +all-mcp-arch-common/infra/maas.yml mcp-common-ha/infra/kvm_novcp.yml -mcp-common-ha/include/maas_proxy.yml +all-mcp-arch-common/opnfv/maas_proxy.yml mcp-common-ha/openstack_control.yml mcp-common-ha/openstack_telemetry.yml mcp*common-*/openstack_init.yml |