sts-sponsors team mailing list archive

[Christian Grabowski <mp+436802@xxxxxxxxxxxxxxxxxx>]

Christian Grabowski has proposed merging ~cgrabowski/maas-ci/+git/maas-ci-internal:fixes_from_renaming_terraform_job into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

Commit message:
handle missing primary rack to enalbe DHCP

fix paths from renaming job



Requested reviews:
  MAAS Lander (maas-lander): unittests
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~cgrabowski/maas-ci/+git/maas-ci-internal/+merge/436802
-- 
Your team MAAS Committers is requested to review the proposed merge of ~cgrabowski/maas-ci/+git/maas-ci-internal:fixes_from_renaming_terraform_job into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

diff --git a/jobs/maas-terraform-test.yaml b/jobs/maas-terraform-test.yaml
index 2e328c6..03d86e8 100644
--- a/jobs/maas-terraform-test.yaml
+++ b/jobs/maas-terraform-test.yaml
@@ -1,9 +1,9 @@
 ---
 - project:
     name: maas-terraform
-    deps_dir: '/home/ubuntu/workspace/maas-terraform-tester/maas-ci-internal'
-    build_dir: '/home/ubuntu/workspace/maas-terraform-tester/maas-ci-internal'
-    setup_env_dir: '/home/ubuntu/workspace/maas-terraform-tester/maas-ci-internal'
+    deps_dir: '/home/ubuntu/workspace/gh-maas-terraform-tester/maas-ci-internal'
+    build_dir: '/home/ubuntu/workspace/gh-maas-terraform-tester/maas-ci-internal'
+    setup_env_dir: '/home/ubuntu/workspace/gh-maas-terraform-tester/maas-ci-internal'
     test_dir: /run/build/tests
     deps_command: ./utilities/terraform/terraform_deps
     build_command: ./utilities/terraform/terraform_build
@@ -21,11 +21,15 @@
     views:
       - 'gh-{name}'
     triggers:
-      - timed: 'H H * * *'
+      - timed: '1H H * * *'
     ssh_key: 'maas-lander-ssh-key'
     api_token_env_var: 'TF_VAR_apikey'
     extra_parameters:
       - string:
+          name: PRIMARY_RACK_CONTROLLER
+          description: "The rack controller to manage the VLAN DHCP will be enabled on"
+          default: "ckbafg"
+      - string:
           name: TF_VAR_maas_url
           description: "The MAAS URL for Terraform to connect to"
           default: 'http://10.245.136.7:5240/MAAS'
diff --git a/utilities/terraform/terraform_post_actions b/utilities/terraform/terraform_post_actions
index 27f4c86..a318db7 100755
--- a/utilities/terraform/terraform_post_actions
+++ b/utilities/terraform/terraform_post_actions
@@ -4,6 +4,15 @@ export no_proxy="${no_proxy:-'localhost'},${MAAS_HOST}"
 export NO_PROXY="${NO_PROXY:-'localhost'},${MAAS_HOST}"
 export GIT_SSH_COMMAND="ssh -i $SSHKEY -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
 
+
+if [ ! -z $http_proxy ]; then
+    echo "Acquire::http::proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/github-ci-proxy
+    echo "Acquire::https::proxy \"$http_proxy\";" >> /etc/apt/apt.conf.d/github-ci-proxy
+
+    mkdir -p ~/.ssh/
+    echo "Host github.com\n  HostName ssh.github.com\n  Port 443\n  ProxyCommand /usr/bin/nc -X connect -x squid.internal %h %p\n" >> ~/.ssh/config
+fi
+
 python3 <<EOF
 import os
 
diff --git a/utilities/terraform/terraform_setup_env b/utilities/terraform/terraform_setup_env
index 44ae9c3..0cf4ab3 100755
--- a/utilities/terraform/terraform_setup_env
+++ b/utilities/terraform/terraform_setup_env
@@ -8,7 +8,9 @@ from maas.client import connect
 if __name__ == "__main__":
     maas = connect(os.environ["TF_VAR_maas_url"], apikey=os.environ["TF_VAR_apikey"])
 
+    rack_controller = maas.rack_controllers.get(system_id=os.environ["PRIMARY_RACK_CONTROLLER"])
     fabric = maas.fabrics.get(id=0)
     vlan = fabric.vlans.get_default()
     vlan.dhcp_on = True
+    vlan.primary_rack = rack_controller
     vlan.save()