diff options
author | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-14 13:45:25 +0400 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-19 14:15:54 +0200 |
commit | 90a442136b0aff8380388ac0a94831d0904e3cb8 (patch) | |
tree | fc94d1128a08f69e47699f60ac8bb36262a502e3 /mcp/patches | |
parent | 6f1993bdcec38c4320f0c4d6488d68fcf4f8dda5 (diff) |
[noha] Bring in OpenDaylight SFC scenario
- bump formulas baseline during docker build;
- refresh patches;
Change-Id: I0a54863f57344c5f8897dc981f704c4d265c5522
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches')
-rw-r--r-- | mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch | 4 | ||||
-rw-r--r-- | mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch | 2 | ||||
-rw-r--r-- | mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-openstack-repo.patch (renamed from mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch) | 0 | ||||
-rw-r--r-- | mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch (renamed from mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch index c983ad728..d8f85691e 100644 --- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch +++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch @@ -25,7 +25,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/DockerMake.yml b/DockerMake.yml -index 2c75586..8fb460d 100644 +index 2c75586..8ac8f81 100644 --- a/DockerMake.yml +++ b/DockerMake.yml @@ -102,12 +102,46 @@ salt-formulas: @@ -33,7 +33,7 @@ index 2c75586..8fb460d 100644 ARG RECLASS_BASE="/srv/salt/reclass" ENV RECLASS_BASE $RECLASS_BASE - RUN echo "Layer python/salt module prerequisites, formulas" \ -+ RUN echo "Layer python/salt module prerequisites, formulas (1 Sep 2018)" \ ++ RUN echo "Layer python/salt module prerequisites, formulas (19 Sep 2018)" \ && mkdir -p /srv/salt \ && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \ && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \ diff --git a/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch index 7c36437f6..f003c2031 100644 --- a/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch +++ b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch @@ -20,7 +20,7 @@ Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystone/client/single.yml b/keystone/client/single.yml -index ad2d55a1..120a2359 100644 +index b8ab7f1b..98cf359c 100644 --- a/keystone/client/single.yml +++ b/keystone/client/single.yml @@ -5,7 +5,7 @@ classes: diff --git a/mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-openstack-repo.patch index 1da4a2124..1da4a2124 100644 --- a/mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch +++ b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-openstack-repo.patch diff --git a/mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch b/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch index b2337bcf3..b2337bcf3 100644 --- a/mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch +++ b/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch |