From 3dd58f27b33ec53c802809764ff5fa8293dcdd17 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 17 Feb 2018 21:43:21 +0100 Subject: u/fuel: Bump & rebase for virtual PDF support Finally drop hardcoded IP addresses for virtual deploys from reclass, but keep one small patch adjusting the local vPDF to achieve the same goal. JIRA: FUEL-322 Change-Id: I56a3b0487f564355a4c51b4eb71ec97e92531f1d Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch') 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 0d24d07b..2129d2a7 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 create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index fb20a81..a174640 100755 +index 6d7c0b4..a7043d9 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 \ @@ -30,16 +30,16 @@ index fb20a81..a174640 100755 salt -C 'kvm*' pkg.install bridge-utils +salt -C 'kvm* or cmp*' state.apply opnfv.adduser - salt -C 'kvm*' state.apply linux.network + salt -C 'kvm*' state.apply linux.network,linux.system.kernel salt -C 'kvm* or cmp*' state.apply 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 009eeba..9349e7e 100755 +index afdfb4f..0c0d69c 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 - ((attempt+=1)) - done +@@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no + # Check all vcp nodes are available + wait_for 25.0 "(for n in ${vcp_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)" +wait_for 5.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser" wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" -- cgit 1.2.3-korg