summaryrefslogtreecommitdiffstats
path: root/mcp/patches/docker
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-05 16:44:05 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-21 15:15:31 +0000
commit378d1f3b53053fee922accd48d37f1c678acd1fd (patch)
treeee9012b822a3000a1aa822d7d62af9c6414769cc /mcp/patches/docker
parentba754f2eb858756dd92b3f583442bbff9c991e82 (diff)
submodule: Bump salt-formula-maas
* bump salt-formula-maas git submodule; * sync AArch64 initial salt config with the x86_64 default config; * bump Pharos git submodule to sync `power_pass` MaaS configuration paramater naming; Change-Id: Ic59dd8becb6d83a9e67004c38d51681c88c4be7c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 4c3c9c9a321d724e137f61e23509b6734ac836b7)
Diffstat (limited to 'mcp/patches/docker')
-rw-r--r--mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch3
1 files changed, 3 insertions, 0 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 9a0a0cf88..a96c24b1f 100644
--- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
@@ -20,6 +20,9 @@ Subject: [PATCH] OPNFV package installation, Ubuntu user
`salt_minion_reclass_dependencies`;
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ DockerMake.yml | 38 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/DockerMake.yml b/DockerMake.yml
index 2c75586..13813a2 100644