diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-14 16:33:16 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-16 11:54:57 +0000 |
| commit | df8ae6cc0dcef13ee06aec9b86a8adc5c0294c75 (patch) | |
| tree | 5060b08186e014ae311110fa43741a9201a8a0ff /mcp/reclass | |
| parent | 07d7e4c43e082fdfae24779ceaee800fb8feeec4 (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>
(cherry picked from commit 1a8153f6391bdde1bab21f7831841f5b6070832d)
Diffstat (limited to 'mcp/reclass')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml | 9 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml | 9 |
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: |