From f19e006f84e98bdee061d79e68c316364251dcbc Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 31 May 2017 16:12:43 +0400
Subject: [mcp] Bring in dpdk scenario support

Change-Id: Ifd6d61026a0e98e8faf59c7d218333122d70ffe9
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 mcp/reclass/scripts/infra.sh           |  9 ++++++---
 mcp/reclass/scripts/salt.sh            |  7 +++++--
 mcp/reclass/scripts/user-data.sh       | 10 ----------
 mcp/reclass/scripts/user-data.template | 10 ++++++++++
 4 files changed, 21 insertions(+), 15 deletions(-)
 delete mode 100755 mcp/reclass/scripts/user-data.sh
 create mode 100644 mcp/reclass/scripts/user-data.template

(limited to 'mcp/reclass/scripts')

diff --git a/mcp/reclass/scripts/infra.sh b/mcp/reclass/scripts/infra.sh
index b83f21508..c88c061fd 100755
--- a/mcp/reclass/scripts/infra.sh
+++ b/mcp/reclass/scripts/infra.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 BASE_IMAGE=https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
-declare -A NODES=( [cfg01]=4096 [ctl01]=6144 [ctl02]=6144 [ctl03]=6144 [gtw01]=2048 [cmp01]=2048 )
+declare -A NODES=( [cfg01]=4096 [ctl01]=8192 [ctl02]=8192 [ctl03]=8192 [gtw01]=2048 [cmp01]=6144 )
 
 # get required packages
 apt-get install -y mkisofs curl virtinst cpu-checker qemu-kvm
@@ -13,6 +13,9 @@ apt-get install -y mkisofs curl virtinst cpu-checker qemu-kvm
 mkdir -p images
 wget -P /tmp -nc $BASE_IMAGE
 
+# generate cloud-init user data
+envsubst < user-data.template > user-data.sh
+
 for node in "${!NODES[@]}"; do
   # clean up existing nodes
   if [ "$(virsh domstate $node 2>/dev/null)" == 'running' ]; then
@@ -60,8 +63,8 @@ for node in "${!NODES[@]}"; do
   sleep $[RANDOM%5+1]
 done
 
-CONNECTION_ATTEMPTS=20
-SLEEP=15
+CONNECTION_ATTEMPTS=60
+SLEEP=5
 
 # wait until ssh on Salt master is available
 echo "Attempting to ssh to Salt master ..."
diff --git a/mcp/reclass/scripts/salt.sh b/mcp/reclass/scripts/salt.sh
index 6c60c5662..b6f844e83 100755
--- a/mcp/reclass/scripts/salt.sh
+++ b/mcp/reclass/scripts/salt.sh
@@ -7,7 +7,10 @@
 ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << SALT_INSTALL_END
   sudo -i
 
-  apt-get update
+  echo -n 'Checking out cloud-init has finished running ...'
+  while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo -n '.'; sleep 1; done
+  echo ' done'
+
   apt-get install -y git curl subversion
 
   svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts
@@ -15,6 +18,6 @@ ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << SALT_INSTALL_END
   ln -s /root/fuel/mcp/reclass /srv/salt/reclass
 
   cd /srv/salt/scripts
-  MASTER_HOSTNAME=cfg01.virtual-mcp-ocata-ovs.local ./salt-master-init.sh
+  MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} ./salt-master-init.sh
   salt-key -Ay
 SALT_INSTALL_END
diff --git a/mcp/reclass/scripts/user-data.sh b/mcp/reclass/scripts/user-data.sh
deleted file mode 100755
index 2b9b6845c..000000000
--- a/mcp/reclass/scripts/user-data.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/salt.list
-apt update
-apt-get install -y salt-minion
-rm /etc/salt/minion_id
-rm -f /etc/salt/pki/minion/minion_master.pub
-echo "id: $(hostname).virtual-mcp-ocata-ovs.local" > /etc/salt/minion
-echo "master: 192.168.10.100" >> /etc/salt/minion
-service salt-minion restart
diff --git a/mcp/reclass/scripts/user-data.template b/mcp/reclass/scripts/user-data.template
new file mode 100644
index 000000000..811a58c70
--- /dev/null
+++ b/mcp/reclass/scripts/user-data.template
@@ -0,0 +1,10 @@
+#!/bin/bash
+wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/salt.list
+apt update
+apt-get install -y salt-minion
+rm /etc/salt/minion_id
+rm -f /etc/salt/pki/minion/minion_master.pub
+echo "id: $(hostname).${CLUSTER_DOMAIN}" > /etc/salt/minion
+echo "master: ${SALT_MASTER}" >> /etc/salt/minion
+service salt-minion restart
-- 
cgit 1.2.3-korg