From 08bb570b39b123c5a5adf70e34e05bb43a6e3387 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 25 Aug 2017 15:47:55 +0400 Subject: [baremetal] Add required user on vcp nodes * add user of "ubuntu" so that functest gets cluster credentials * reduce cpu resources for vcp nodes in nofeature scenario * tune salt targets for maas state * specify ntp servers Change-Id: I433a1de1cd2c69c6747c62c3359f5485dee3bfa4 Signed-off-by: Michael Polenchuk --- mcp/config/states/maas | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mcp/config/states') diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 31625d827..01f8ee0cd 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -77,7 +77,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network salt -C 'kvm*' system.reboot -wait_for 90 "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" +wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp @@ -100,9 +100,9 @@ while [ $rc -ne 0 ]; do sleep 5 done -wait_for 10 "salt -C '* and not cfg01* and not mas01*' ssh.set_auth_key ${SUDO_USER} \ - $(awk 'NR==1{print $2}' $(eval echo ~${SUDO_USER}/.ssh/authorized_keys))" - wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" -wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply salt" -wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp" +wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt" +wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp" + +wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \ + $(awk 'NR==1{print $2}' $(eval echo ~${SUDO_USER}/.ssh/authorized_keys))" -- cgit