Merge pull request #9 from stackhpc/smslab-cgg

AUFN terraform updates from CGG workshop

Author: oneswig

a-seed-from-nothing.sh

@@ -27,7 +27,8 @@ sudo setenforce 0
 # Useful packages
 if [[ "${CLOUD_USER}" = "ubuntu" ]]
 then
-    sudo apt install -y git tmux lvm2
+    sudo apt update
+    sudo apt install -y git tmux lvm2 iptables
 else
     sudo dnf install -y git tmux lvm2
 fi
@@ -108,10 +109,14 @@ then
 neutron_plugin_agent: "ovn"
 neutron_ovn_dhcp_agent: "yes"
 EOF
-    cat <<EOF | sudo tee -a config/src/kayobe-config/etc/kayobe/kolla/globals.yml
+    cat <<EOF | sudo tee -a config/src/kayobe-config/etc/kayobe/bifrost.yml
 kolla_bifrost_extra_kernel_options:
   - "console=ttyS0"
+EOF
+    cat <<EOF | sudo tee -a config/src/kayobe-config/etc/kayobe/kolla.yml
 kolla_enable_ovn: yes
+EOF
+    cat <<EOF | sudo tee -a config/src/kayobe-config/etc/kayobe/neutron.yml
 kolla_neutron_ml2_type_drivers:
   - geneve
   - vlan

openstack-device.tf

@@ -28,7 +28,7 @@ resource "null_resource" "bastion" {
   count = var.create_bastion ? 1 : 0
   connection {
     host        = openstack_compute_floatingip_associate_v2.bastion[0].floating_ip
-    user        = "centos"
+    user        = var.image_user
     private_key = tls_private_key.default.private_key_pem
     agent       = false
     timeout     = "300s"
@@ -84,6 +84,9 @@ resource "openstack_compute_floatingip_associate_v2" "registry" {
 
 resource "null_resource" "registry" {
   connection {
+    bastion_user        = var.create_bastion ? var.image_user : null
+    bastion_private_key = var.create_bastion ? tls_private_key.default.private_key_pem : null
+    bastion_host        = var.create_bastion ? openstack_compute_floatingip_associate_v2.bastion[0].floating_ip : null
     user                = var.image_user
     private_key         = tls_private_key.default.private_key_pem
     agent               = false
@@ -131,6 +134,10 @@ resource "openstack_compute_instance_v2" "lab" {
     name = var.lab_net_ipv4
   }
 
+  timeouts {
+    create = "30m"
+  }
+
   depends_on = [openstack_compute_keypair_v2.ufn_lab_key, null_resource.registry]
 }
 
@@ -150,6 +157,9 @@ resource "null_resource" "lab" {
   count = var.lab_count
 
   connection {
+    bastion_user        = var.create_bastion ? var.image_user : null
+    bastion_private_key = var.create_bastion ? tls_private_key.default.private_key_pem : null
+    bastion_host        = var.create_bastion ? openstack_compute_floatingip_associate_v2.bastion[0].floating_ip : null
     user                = var.image_user
     private_key         = tls_private_key.default.private_key_pem
     agent               = false

pull-retag-push-images.sh

@@ -42,7 +42,8 @@ if [ ! "$(sudo docker ps -q -f name=registry)" ]; then
 fi
 
 tag=${1:-yoga}
-images="kolla/${DISTRO}-source-kolla-toolbox
+images="kolla/${DISTRO}-source-bifrost-deploy
+kolla/${DISTRO}-source-kolla-toolbox
 kolla/${DISTRO}-source-haproxy
 kolla/${DISTRO}-source-mariadb-server
 kolla/${DISTRO}-source-mariadb-clustercheck
@@ -95,6 +96,7 @@ kolla/${DISTRO}-source-prometheus-node-exporter
 kolla/${DISTRO}-source-prometheus-elasticsearch-exporter
 kolla/${DISTRO}-source-prometheus-mysqld-exporter
 kolla/${DISTRO}-source-prometheus-openstack-exporter
+kolla/${DISTRO}-source-prometheus-libvirt-exporter
 kolla/${DISTRO}-source-grafana
 kolla/${DISTRO}-source-cinder-scheduler
 kolla/${DISTRO}-source-cinder-volume
@@ -103,8 +105,7 @@ kolla/${DISTRO}-source-cinder-api
 kolla/${DISTRO}-source-ovn-controller
 kolla/${DISTRO}-source-ovn-northd
 kolla/${DISTRO}-source-ovn-nb-db-server
-kolla/${DISTRO}-source-ovn-sb-db-server
-kolla/${DISTRO}-source-bifrost-deploy"
+kolla/${DISTRO}-source-ovn-sb-db-server"
 
 for image in $images; do
     sudo docker pull $image:$tag