summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-14 16:33:16 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-15 12:30:07 +0400
commit1a8153f6391bdde1bab21f7831841f5b6070832d (patch)
treef444e9ccdbd6df856ca70426d6fa24142939b4c6 /mcp/reclass/classes
parent167e704d40bb40b1edf2e014444f0201a28178fa (diff)
Update opendaylight/neutron patch
Align opendaylight support patch with latest neutron formula. Employ native ML2 backend/engine option as is instead of bringing in the "opendaylight" keyword into reclass model. Unfreeze the maas & neutron formulas versions. Change-Id: I2807dcf9f83b01d453bca6453524f840c378972f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes')
-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: