Update user-data for new cfg01-day01 image
According to the documentation, salt-master and
salt-minion services on cfg01 are disabled
by default and are enabled by a script included
to config drive user-data.
For manual-like deployments without such
config-drive, enable these services at the bootstrap
time.
Closes-Bug: PROD-24186
Change-Id: Id495cde8a986a11a1d982e6250ac16dcaa93fafc
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data-cfg01.yaml
index 3f4f128..b77550a 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data-cfg01.yaml
@@ -18,8 +18,6 @@
expire: False
bootcmd:
- # Block access to SSH while node is preparing
- #- cloud-init-per once sudo iptables -A INPUT -p tcp --dport 22 -j DROP
# Enable root access
- sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
- service sshd restart
@@ -51,16 +49,13 @@
- echo "Preparing base OS"
- echo "nameserver 172.18.208.44" > /etc/resolv.conf;
- - which wget >/dev/null || (apt-get update; apt-get install -y wget);
- # Install common packages
- - eatmydata apt-get install -y python-pip git curl tmux byobu iputils-ping traceroute htop tree sshuttle
-
- ########################################################
- # Node is ready, allow SSH access
- #- echo "Allow SSH access ..."
- #- sudo iptables -D INPUT -p tcp --dport 22 -j DROP
- ########################################################
+ - mkdir -p /srv/salt/reclass/nodes
+ - systemctl enable salt-master
+ - systemctl enable salt-minion
+ - systemctl start salt-master
+ - systemctl start salt-minion
+ - salt-call -l info --timeout=120 test.ping
write_files:
- path: /etc/network/interfaces