diff options
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml | 1 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 | ||||
| -rw-r--r-- | mcp/patches/patches_neutron.list | 1 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 5 |
4 files changed, 7 insertions, 1 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml index f558f0a4b..6eb1e33ce 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -5,6 +5,7 @@ cluster: - maas - dpdk - openstack_ha + - neutron_compute - networks virtual: nodes: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 4140adb67..e20a34179 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -1,4 +1,3 @@ -/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch /usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch diff --git a/mcp/patches/patches_neutron.list b/mcp/patches/patches_neutron.list new file mode 100644 index 000000000..e80d7617d --- /dev/null +++ b/mcp/patches/patches_neutron.list @@ -0,0 +1 @@ +/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 081513c6b..b0a26873d 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -65,4 +65,9 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END salt -C '* and not cfg01*' pkg.upgrade refresh=False salt '*' state.sls ntp + + # Temporary fixup for mismatch between neutron formula and reclass model + salt-call pkg.install salt-formula-neutron allow_updates=False refresh=False \ + version=2016.12.1+201709251458.f0607d9-1xenial1 + cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches_neutron.list formulas SALT_INSTALL_END |