diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-18 17:19:13 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-18 17:20:18 +0200 |
| commit | cdbb329e8e1f65ae514f058ac4259c580833c30e (patch) | |
| tree | 55ee9d4cdd4175ced7e40d0e2fac4913d01d1ece /patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch | |
| parent | 412d4a7e440c4c8765b50608ad67e8d05c719b56 (diff) | |
p/fuel: Rebase after salt control image update
Change-Id: I362ae48d576b14c87188e88599e0a0542028dcb2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch')
| -rw-r--r-- | patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch index e991bbcc..5a937d1d 100644 --- a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ b/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch @@ -14,7 +14,7 @@ fi 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh -index 1ace950..b3ed5ec 100755 +index cf7b3b3..2b4e724 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -139,7 +139,7 @@ URI_REGEXP='(file|https?|ftp)://.*' @@ -27,7 +27,7 @@ index 1ace950..b3ed5ec 100755 # Variables below are disabled for now, to be re-introduced or removed later diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 3b722ea..235f0b2 100755 +index f02fff8..21c7afe 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface |