Working deploy for controller and compute nodes
- use 'dash' branch for mk-lab-salt-model repo (it has a lot of
improvements and fixes)
- use less number of nodes to match the 'mk22-lab-advanced' model
- force update packages before configuring salt.minions
- use saltstack repo for latest salt.minions on trusty
* Note if the deploy starts from an 'underlay' snapshot,
keepalived can lose VIP after update DHCP leases on nodes.
It's better to start deploy from clean environment.
diff --git a/tcp_tests/templates/tcpcloud--user-data-master-node.yaml b/tcp_tests/templates/tcpcloud--user-data-master-node.yaml
index bfbb85f..fa24840 100644
--- a/tcp_tests/templates/tcpcloud--user-data-master-node.yaml
+++ b/tcp_tests/templates/tcpcloud--user-data-master-node.yaml
@@ -39,6 +39,8 @@
- which wget >/dev/null || (apt-get update; apt-get install -y wget)
- echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
+ # 'tcp-salt' from trusty is for temporary workaround until formulas will be fixed in xenial
+ - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty tcp-salt" >> /etc/apt/sources.list
- wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
- apt-get clean
@@ -77,7 +79,17 @@
- HOME=/root git config --global user.name "TCP QA"
- echo "Configuring reclass ..."
- - git clone https://github.com/Mirantis/mk-lab-salt-model.git /srv/salt/reclass -b master
+ - git clone https://github.com/Mirantis/mk-lab-salt-model.git /srv/salt/reclass -b dash
+ - sed -i 's/ master/ dash/' /srv/salt/reclass/classes/cluster/mk20_lab_advanced/openstack_config.yml
+ - |
+ cat << 'EOF' >> /srv/salt/reclass/nodes/control/{hostname}.yml
+ # local storage
+ reclass:
+ storage:
+ data_source:
+ engine: local
+ EOF
+ - cd /srv/salt/reclass; git add -A;git commit -m"use dash repo"
- mkdir -p /srv/salt/reclass/classes/service
- for i in /usr/share/salt-formulas/reclass/service/*; do ln -s $i /srv/salt/reclass/classes/service/; done