summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-17 11:01:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-17 11:01:31 +0000
commitc772c4213df2d42df72c9be39ca56b44eeb77106 (patch)
tree4ad0c1f0d342431eb06e77cd561d3c2db1750c05 /mcp/reclass
parent302af377cbe7a68da3a0f52eb7ffea3f27dddb52 (diff)
parentdf8ae6cc0dcef13ee06aec9b86a8adc5c0294c75 (diff)
Merge "Update opendaylight/neutron patch" into stable/euphrates
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml9
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml9
2 files changed, 0 insertions, 18 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
index 275941120..e0f9a2a94 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
@@ -47,15 +47,6 @@ parameters:
master:
accept_policy: open_mode
file_recv: true
- environment:
- prd:
- formula:
- maas:
- # Temporary fixup for MaaS formula machine status int.lower()
- version: 0.0.1+201711061044.9f1b034~xenial1
- neutron:
- # Temporary fixup for mismatch between formula and reclass model
- version: 2016.12.1+201709251458.f0607d9-1xenial1
reclass:
storage:
data_source:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
index 21ed8d329..3c3d5260a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
@@ -43,15 +43,6 @@ parameters:
salt:
master:
file_recv: true
- environment:
- prd:
- formula:
- maas:
- # Temporary fixup for MaaS formula machine status int.lower()
- version: 0.0.1+201711061044.9f1b034~xenial1
- neutron:
- # Temporary fixup for mismatch between formula and reclass model
- version: 2016.12.1+201709251458.f0607d9-1xenial1
reclass:
storage:
data_source: