diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-15 16:23:49 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 00:08:16 +0000 |
| commit | a4e42550c023bd746143ba323de2bcc61e758bbb (patch) | |
| tree | c02bcdac5d5de9d74308a0f4e79b6663047c4f4b /patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch | |
| parent | 6e71b19097781a7190bcec015afc62be7961fa43 (diff) | |
u/fuel: Bump & rebase for common reclass rework
Change-Id: Id7d125b746e97d6e186a7890a4c2f599e24a186c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 783585e0379cffbfe0fe242a4daab9f5c4ab1547)
Diffstat (limited to 'patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch index 0b6598b8..bfcaba12 100644 --- a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch @@ -21,10 +21,10 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 59424ac..12fff84 100755 +index 899972c..1ea14b1 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -6,6 +6,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" +@@ -12,6 +12,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" # KVM, compute node prereqs (libvirt first), VCP deployment salt -C 'kvm*' pkg.install bridge-utils @@ -32,7 +32,7 @@ index 59424ac..12fff84 100755 salt -C 'kvm*' state.apply linux.network salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 salt -C 'kvm*' system.reboot -@@ -30,6 +31,7 @@ while [ $rc -ne 0 ]; do +@@ -36,6 +37,7 @@ while [ $rc -ne 0 ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; @@ -41,10 +41,10 @@ index 59424ac..12fff84 100755 sleep 5 done diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml -index c9be2c2..5c84ec6 100644 +index aa780e6..e4069c0 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml -@@ -2,3 +2,7 @@ +@@ -9,3 +9,7 @@ classes: - cluster.all-mcp-ocata-common.opnfv.runtime - cluster.all-mcp-ocata-common.opnfv.pod_config |