# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+/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
+++ /dev/null
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch
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:
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:
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
- # Temporary fixup for MaaS formula machine status int.lower()
- salt-call pkg.install salt-formula-maas allow_updates=False refresh=False \
- version=0.0.1+201711061044.9f1b034~xenial1
- cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches_neutron.list formulas
SALT_INSTALL_END