Revert "Purge the unattended-upgrades pkg"
This reverts commit d81b23c4ce3eb6c753119c50f5c0ec0a5155ed8a.
Change-Id: Iad2e43e3be3e468a4df88f5ccd7b60cc3cbfac32
diff --git a/tcp_tests/templates/cookied-model-generator/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookied-model-generator/underlay--user-data-cfg01.yaml
index ba4ee4e..d07e03f 100644
--- a/tcp_tests/templates/cookied-model-generator/underlay--user-data-cfg01.yaml
+++ b/tcp_tests/templates/cookied-model-generator/underlay--user-data-cfg01.yaml
@@ -23,14 +23,13 @@
# Enable root access
- sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
- service sshd restart
-
output:
all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
runcmd:
# Prepare network connection
- sudo ifdown ens3
- #- sudo ifup ens3
+ - sudo ifup ens3
#- sudo route add default gw {gateway} {interface_name}
# Configure dhclient
@@ -69,13 +68,6 @@
- sudo iptables -D INPUT -p tcp --dport 22 -j DROP
########################################################
- # Purge the unattended-upgrades package (Workaround for PROD-17904, PROD-18736)"
- - echo "APT::Periodic::Update-Package-Lists 0;" > /etc/apt/apt.conf.d/99dont_update_package_list-salt
- - echo "APT::Periodic::Download-Upgradeable-Packages 0;" > /etc/apt/apt.conf.d/99dont_update_download_upg_packages-salt
- - echo "APT::Periodic::Unattended-Upgrade 0;" > /etc/apt/apt.conf.d/99disable_unattended_upgrade-salt
- - apt-get -y purge unattended-upgrades
- - reboot
-
write_files:
- path: /etc/default/grub.d/97-enable-grub-menu.cfg
content: |
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 2d06193..95f207a 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -62,8 +62,7 @@
echo "{{ UBUNTU_REPOSITORY }}" > /etc/apt/sources.list.d/ubuntu.list
echo "{{ UBUNTU_UPDATES_REPOSITORY }}" > /etc/apt/sources.list.d/ubuntu_updates.list
echo "{{ UBUNTU_SECURITY_REPOSITORY }}" > /etc/apt/sources.list.d/ubuntu_security.list
- eatmydata apt-get clean;
- apt-get update;
+ eatmydata apt-get clean && apt-get update;
sync;
node_name: {{ NODE_NAME }}
retry: {count: 1, delay: 5}