Fixed merge conflicts

Author: wtripp180901

ansible/roles/k3s/files/start_k3s.yml

@@ -4,7 +4,7 @@
     os_metadata: "{{ lookup('url', 'http://169.254.169.254/openstack/latest/meta_data.json') | from_json }}"
     k3s_token: "{{ os_metadata.meta.k3s_token }}"
     k3s_server_name: "{{ os_metadata.meta.k3s_server }}"
-    service_name: "{{ 'k3s' if k3s_server_name == 'none' else 'k3s-agent' }}"
+    service_name: "{{ 'k3s-agent' if k3s_server_name is defined else 'k3s' }}"
   tasks:
     - name: Add the token for joining the cluster to the environment
       no_log: false # avoid logging the server token
@@ -16,7 +16,7 @@
       ansible.builtin.lineinfile:
         path: "/etc/systemd/system/{{ service_name }}.service.env"
         line: "K3S_URL=https://{{ k3s_server_name }}:6443"
-      when: k3s_server_name != "none"
+      when: k3s_server_name is defined
 
     - name: Start k3s service
       ansible.builtin.systemd:

environments/skeleton/{{cookiecutter.environment}}/terraform/compute.tf

@@ -16,5 +16,6 @@ module "compute" {
   key_pair = var.key_pair
   environment_root = var.environment_root
   k3s_token = var.k3s_token
+  k3s_server = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
   security_group_ids = [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id]
 }

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/nodes.tf

@@ -47,7 +47,7 @@ resource "openstack_compute_instance_v2" "compute" {
   metadata = {
     environment_root = var.environment_root
     k3s_token = var.k3s_token
-    k3s_server = "${var.cluster_name}-control"
+    k3s_server = var.k3s_server
   }
 
   user_data = <<-EOF

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/variables.tf

@@ -71,3 +71,8 @@ variable "security_group_ids" {
 variable "k3s_token" {
     type = string
 }
+
+variable "k3s_server" {
+    description = "Name/address of k3s server"
+    type = string
+}

environments/skeleton/{{cookiecutter.environment}}/terraform/nodes.tf

@@ -77,7 +77,6 @@ resource "openstack_compute_instance_v2" "control" {
   metadata = {
     environment_root = var.environment_root
     k3s_token = var.k3s_token
-    k3s_server = "none"
   }
 
   user_data = <<-EOF
@@ -127,7 +126,7 @@ resource "openstack_compute_instance_v2" "login" {
   metadata = {
     environment_root = var.environment_root
     k3s_token = var.k3s_token
-    k3s_server = "${var.cluster_name}-control"
+    k3s_server = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
   }
 
   user_data = <<-EOF