diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-22 19:45:25 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-22 19:45:54 +0100 |
commit | 9ae9224167df484e79da620680b95fcfa349d644 (patch) | |
tree | 5950afddecc30c6c21f72ecfc090b5992a6a9552 /patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | |
parent | d1de8877810d0ab0a6e0381e370f5eaa3b07e52d (diff) |
u/fuel: Bump & rebase for lab proxy support
Change-Id: I7730923c80500f558702b0406dc9b983ba8f5b27
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch')
-rw-r--r-- | patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch index a458db7e..3292ee24 100644 --- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch @@ -22,7 +22,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index 838a2b3..653d6d0 100755 +index 15fc572..7c86513 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ @@ -32,9 +32,9 @@ index 838a2b3..653d6d0 100755 +salt -C 'kvm* or cmp*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network salt -C 'kvm* or cmp*' state.apply salt.minion - salt -C 'kvm* or cmp*' service.force_reload salt-minion + salt -C 'cmp*' state.apply linux.system diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index d717f39..7ef4e15 100755 +index a3fcb02..c4bd3dd 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -49,6 +49,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do |