Unverified Commit e6233d9f authored by Derek Nola's avatar Derek Nola Committed by GitHub
Browse files

Add support for Service Envs (#237) 



* Add support for service ENVs
* Rename PR template
Signed-off-by: default avatarDerek Nola <derek.nola@suse.com>
parent e864933b

Vagrantfile

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ def provision(vm, role, node_num) 


  vm.provision "ansible", run: 'once' do |ansible|

    ansible.compatibility_mode = "2.0"

    ansible.playbook = "playbook/site.yml"

    ansible.playbook = "playbook/debug.yml"

    ansible.groups = {

      "server" => NODE_ROLES.grep(/^server/),

      "agent" => NODE_ROLES.grep(/^agent/),
@@ -32,7 +32,8 @@ def provision(vm, role, node_num) 
      # Required to use the private network configured above

      extra_server_args: "--node-external-ip #{node_ip} --flannel-iface eth1", 

      extra_agent_args: "--node-external-ip #{node_ip} --flannel-iface eth1",

      k3s_server_location: "/data/k3s",

      # Not needed, left as reference for ruby-ansible list syntax

      # extra_service_envs: [ "NO_PROXY='localhost'" ],

    }

  end

end

inventory-sample.yml

+1 −0
Original line number Diff line number Diff line
@@ -23,3 +23,4 @@ k3s_cluster: 
    # api_port: 6443

    # k3s_server_location: /var/lib/rancher/k3s

    # systemd_dir: /etc/systemd/system

    # extra_service_envs: [ 'ENV_VAR1=VALUE1', 'ENV_VAR2=VALUE2' ]

roles/k3s/server/tasks/main.yml

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,13 @@ 
        group: root

        mode: 0644



    - name: Add service enviorment variables

      when: extra_service_envs is defined

      ansible.builtin.lineinfile:

        path: "{{ systemd_dir }}/k3s.service.env"

        line: "{{ item }}"

      with_items: "{{ extra_service_envs }}"



    - name: Enable and check K3s service

      ansible.builtin.systemd:

        name: k3s