diff --git a/ansible/inventory/dev.yaml b/ansible/inventory/dev.yaml deleted file mode 100644 index 8c714ff..0000000 --- a/ansible/inventory/dev.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dev: - hosts: - 10.3.0.101: - vars: - confdir: "/root/server-configs" diff --git a/ansible/inventory/live.yaml b/ansible/inventory/inventory.yaml similarity index 50% rename from ansible/inventory/live.yaml rename to ansible/inventory/inventory.yaml index 8a51e4f..d071b2e 100644 --- a/ansible/inventory/live.yaml +++ b/ansible/inventory/inventory.yaml @@ -1,6 +1,11 @@ dev: + hosts: + 10.3.0.101: + vars: + confdir: "/root/server-configs" + +live: hosts: 10.3.0.102: vars: confdir: "/root/server-configs" - diff --git a/ansible/roles/k8s-cert-manager/tasks/main.yml b/ansible/roles/k8s-cert-manager/tasks/main.yml index 6613c2b..f4aed59 100644 --- a/ansible/roles/k8s-cert-manager/tasks/main.yml +++ b/ansible/roles/k8s-cert-manager/tasks/main.yml @@ -11,17 +11,17 @@ - name: Copy value files ansible.builtin.copy: src: files/values.yaml - dest: "{{ confdir }}"/cert-manager-values.yaml + dest: "{{ confdir }}/cert-manager-values.yaml" - name: Copy clusterissuer-staging yaml ansible.builtin.copy: src: files/clusterissuer-staging.yaml - dest: "{{ confdir }}"/ + dest: "{{ confdir }}/" - name: Copy clusterissuer-prod yaml ansible.builtin.copy: src: files/clusterissuer-prod.yaml - dest: "{{ confdir }}"/ + dest: "{{ confdir }}/" - name: Install cert-manager kubernetes.core.helm: @@ -36,17 +36,17 @@ values: installCRDs: true values_files: - "{{ confdir }}"/cert-manager-values.yaml + "{{ confdir }}/cert-manager-values.yaml" state: present - name: Create staging clusterissuer for letsencrypt kubernetes.core.k8s: kubeconfig: /etc/rancher/k3s/k3s.yaml state: present - src: "{{ confdir }}"/clusterissuer-staging.yaml + src: "{{ confdir }}/clusterissuer-staging.yaml" - name: Create prod clusterissuer for letsencrypt kubernetes.core.k8s: kubeconfig: /etc/rancher/k3s/k3s.yaml state: present - src: "{{ confdir }}"/clusterissuer-prod.yaml + src: "{{ confdir }}/clusterissuer-prod.yaml" diff --git a/ansible/roles/k8s-kube-prom-stack/tasks/main.yml b/ansible/roles/k8s-kube-prom-stack/tasks/main.yml index e00b3cc..1554019 100644 --- a/ansible/roles/k8s-kube-prom-stack/tasks/main.yml +++ b/ansible/roles/k8s-kube-prom-stack/tasks/main.yml @@ -11,12 +11,12 @@ - name: Copy value files ansible.builtin.copy: src: files/values.yaml - dest: "{{ confdir }}"/prom-values.yaml + dest: "{{ confdir }}/prom-values.yaml" - name: Copy wordpress-dashboard ansible.builtin.copy: src: files/wordpress-dashboard.yaml - dest: "{{ confdir }}"/ + dest: "{{ confdir }}/" - name: Install kube-prom-stack kubernetes.core.helm: @@ -29,11 +29,11 @@ wait: yes timeout: 600s values_files: - "{{ confdir }}"/prom-values.yaml + "{{ confdir }}/prom-values.yaml" state: present - name: Add wordpress-dashboard to grafana kubernetes.core.k8s: kubeconfig: /etc/rancher/k3s/k3s.yaml state: present - src: "{{ confdir }}"/wordpress-dashboard.yaml + src: "{{ confdir }}/wordpress-dashboard.yaml" diff --git a/ansible/roles/k8s-nginx-ingress/tasks/main.yml b/ansible/roles/k8s-nginx-ingress/tasks/main.yml index b2c1d7a..afe21b0 100644 --- a/ansible/roles/k8s-nginx-ingress/tasks/main.yml +++ b/ansible/roles/k8s-nginx-ingress/tasks/main.yml @@ -11,7 +11,7 @@ - name: Copy value files ansible.builtin.copy: src: files/values.yaml - dest: "{{ confdir }}"/ingress-values.yaml + dest: "{{ confdir }}/ingress-values.yaml" - name: Install ingress-nginx kubernetes.core.helm: @@ -24,6 +24,6 @@ wait: yes timeout: 600s values_files: - "{{ confdir }}"/ingress-values.yaml + "{{ confdir }}/ingress-values.yaml" state: present diff --git a/ansible/roles/k8s-wordpress/tasks/main.yml b/ansible/roles/k8s-wordpress/tasks/main.yml index 2627322..e75bcd5 100644 --- a/ansible/roles/k8s-wordpress/tasks/main.yml +++ b/ansible/roles/k8s-wordpress/tasks/main.yml @@ -11,7 +11,7 @@ - name: Copy value files ansible.builtin.copy: src: files/values.yaml - dest: "{{ confdir }}"/wordpress-values.yaml + dest: "{{ confdir }}/wordpress-values.yaml" - name: Install wordpress kubernetes.core.helm: @@ -24,6 +24,6 @@ wait: yes timeout: 600s values_files: - "{{ confdir }}"/wordpress-values.yaml + "{{ confdir }}/wordpress-values.yaml" state: present