Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-philroche-eoan-python3-openstackclient into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Philip Roche]

python-openstackclient was dropped after disco

If we want to create or update builder images post disco we need to migrate to python3-openstackclient

python-openstackclient was dropped after disco

If we want to create or update builder images post disco we need to migrate to python3-openstackclient

[Pat Viafore (patviafore)]

review: Approve

[Robert C Jennings (rcj)]

+1

[David Krauser (davidkrauser)]

review: Approve

=== modified file 'templates/img-update.tmpl'
--- templates/img-update.tmpl	2019-04-25 15:20:08 +0000
+++ templates/img-update.tmpl	2019-11-14 14:02:40 +0000
@@ -230,8 +230,16 @@
 esac
 xchroot apt-add-repository -y multiverse
 pkgs+=(ubuntu-snappy-cli
-	python-openstackclient
 	cloud-utils)
+# python-openstackclient was dropped after disco
+case "${suite}" in
+	trusty|xenial|bionic|disco)
+		pkgs+=(python-openstackclient)
+		;;
+	*)
+		pkgs+=(python3-openstackclient)
+		;;
+esac
 case "${suite}" in
 	trusty|xenial)
 		pkgs+=(ubuntu-core-security-utils qemu-user-static qemu-user)