fix: fix role name #21 (#24)

cloud-labs-infra · May 26, 2023 · f1e4d84 · f1e4d84
1 parent 3298517
commit f1e4d84
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -97,7 +97,7 @@ etcd_experimental_distributed_tracing_service_name: 'etcd'
 etcd_experimental_distributed_tracing_instance_id: ''
 # Unsafe flags
 etcd_force_new_cluster: 'false'  # be careful changing this value!
-etcd_unsafe_no_fsync: 'false' # be careful changing this value!
+etcd_unsafe_no_fsync: 'false'  # be careful changing this value!
 # Miscellaneous flags
 etcd_version: 'false'
 etcd_config_file: /etc/etcd/etcd.conf.yaml  # this param won't be in config file, only in systemd unit

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -30,4 +30,4 @@
     #  meta: clear_facts
     - name: "Include etcd_cluster"
       ansible.builtin.include_role:
-        name: "cloud_labs.etcd_cluster"
+        name: "cloudlabsinfra.etcd_cluster"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -1,4 +1,5 @@
 ---
+
 dependency:
   name: galaxy
 driver:
@@ -9,7 +10,7 @@ driver:
     #  - subnet: '172.18.0.0/24'
 platforms:
   - name: etcd-instance-01
-    hostname: etcd-instance-01 
+    hostname: etcd-instance-01
     # custom docker images with systemd for molecule
     #   https://github.com/marciopaiva/molecule-systemd-images
     image: mpaivabarbosa/molecule-systemd-ubuntu:20.04
@@ -23,7 +24,7 @@ platforms:
     # if it is cgroup2fs, then change /etc/default/grub file, GRUB_CMDLINE_LINUX="systemd.unified_cgroup_hierarchy=0"
     # update grub (sudo update-grub), reboot system to eplly changes
     volumes:
-     - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
     override_command: false

diff --git a/molecule/multi-node/molecule.yml b/molecule/multi-node/molecule.yml
@@ -14,7 +14,7 @@ platforms:
     security_opts:
       - seccomp=unconfined
     volumes:
-     - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
     override_command: false

diff --git a/molecule/multi-node_server-auth/converge.yml b/molecule/multi-node_server-auth/converge.yml
@@ -7,7 +7,7 @@
   become: yes
   gather_facts: false
   vars:
-    # ansible-etcd-cluster-certificates role related variables
+    # cloudlabsinfra.etcd_cluster_certificates role related variables
     etcd_cert_dir: /etc/ssl/private
     # ansible-etcd-cluster role related variables
     etcd_trusted_ca_file: "{{ etcd_conf_dir }}/ca.pem"
@@ -29,8 +29,8 @@
   roles:
     - { role: andrewrothstein.etcd }
     - { role: andrewrothstein.cfssl }
-    - { role: ansible-etcd-cluster-certificates }
+    - { role: cloudlabsinfra.etcd_cluster_certificates }
   tasks:
     - name: "Include etcd_cluster"
       ansible.builtin.include_role:
-        name: "cloud_labs.etcd_cluster"
+        name: "cloudlabsinfra.etcd_cluster"
diff --git a/molecule/multi-node_server-auth/molecule.yml b/molecule/multi-node_server-auth/molecule.yml
@@ -14,7 +14,7 @@ platforms:
     security_opts:
       - seccomp=unconfined
     volumes:
-     - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
     override_command: false

diff --git a/molecule/multi-node_server-auth/verify.yml b/molecule/multi-node_server-auth/verify.yml
@@ -6,7 +6,7 @@
   vars:
     etcd_default_inventory_group: etcd
     etcd_client_port: 2379
-    # ansible-etcd-cluster-certificates role related variables
+    # cloudlabsinfra.etcd_cluster_certificates role related variables
     etcd_cert_dir: /etc/ssl/private
   tasks:
     - name: Include verify

diff --git a/molecule/multi-node_server-auth_peer-auth/converge.yml b/molecule/multi-node_server-auth_peer-auth/converge.yml
@@ -7,7 +7,7 @@
   become: yes
   gather_facts: false
   vars:
-    # ansible-etcd-cluster-certificates role related variables
+    # cloudlabsinfra.etcd_cluster_certificates role related variables
     etcd_cert_dir: /etc/ssl/private
     # ansible-etcd-cluster role related variables
     # client/server
@@ -37,8 +37,8 @@
   roles:
     - { role: andrewrothstein.etcd }
     - { role: andrewrothstein.cfssl }
-    - { role: ansible-etcd-cluster-certificates }
+    - { role: cloudlabsinfra.etcd_cluster_certificates }
   tasks:
     - name: "Include etcd_cluster"
       ansible.builtin.include_role:
-        name: "cloud_labs.etcd_cluster"
+        name: "cloudlabsinfra.etcd_cluster"
diff --git a/molecule/multi-node_server-auth_peer-auth/molecule.yml b/molecule/multi-node_server-auth_peer-auth/molecule.yml
@@ -14,7 +14,7 @@ platforms:
     security_opts:
       - seccomp=unconfined
     volumes:
-     - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
     override_command: false

diff --git a/molecule/multi-node_server-auth_peer-auth/verify.yml b/molecule/multi-node_server-auth_peer-auth/verify.yml
@@ -6,7 +6,7 @@
   vars:
     etcd_default_inventory_group: etcd
     etcd_client_port: 2379
-    # ansible-etcd-cluster-certificates role related variables
+    # cloudlabsinfra.etcd_cluster_certificates role related variables
     etcd_cert_dir: /etc/ssl/private
   tasks:
     - name: Include verify

diff --git a/requirements.yml b/requirements.yml
@@ -1,10 +1,10 @@
+---
+
 - name: andrewrothstein.etcd
   version: v2.3.1
 
 - name: andrewrothstein.cfssl
   version: v3.1.1
 
-- name: ansible-etcd-cluster-certificates
-  scm: git
-  version: a268bb4  # 0.2.0
-  src: https://github.com/cloud-labs-infra/ansible-etcd-cluster-certificates.git
+- name: cloudlabsinfra.etcd_cluster_certificates
+  version: v1.0.0