From d6c3fb07de840e24eab1d06aa00d14faa6163ca1 Mon Sep 17 00:00:00 2001 From: dbacon Date: Tue, 25 Aug 2020 09:50:56 +0100 Subject: [PATCH] AZURE-211 Renamed az_* files to azure_* --- az_crowd_dc_node.yml => azure_crowd_dc_node.yml | 8 ++++---- group_vars/{az_node_local.yml => azure_node_local.yml} | 0 inv/az_node_local | 2 +- roles/az_shared_fs_config/defaults/main.yml | 9 --------- .../.yamllint | 0 .../defaults/main.yml | 0 .../handlers/main.yml | 0 .../molecule/default/Dockerfile.j2 | 0 .../molecule/default/molecule.yml | 2 +- .../molecule/default/playbook.yml | 4 ++-- .../molecule/default/tests/test_default.py | 0 .../tasks/main.yml | 0 .../templates/ApplicationInsights.xml.j2 | 0 .../templates/collectd.conf.j2 | 0 roles/{az_common => azure_common}/.yamllint | 0 .../molecule/default/Dockerfile.j2 | 0 .../molecule/default/molecule.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/default/tests/test_default.py | 0 roles/{az_common => azure_common}/tasks/main.yml | 4 ++-- roles/azure_shared_fs_config/defaults/main.yml | 9 +++++++++ .../meta/main.yml | 2 +- .../tasks/main.yml | 0 roles/product_install/molecule/crowd_latest/molecule.yml | 2 +- 24 files changed, 23 insertions(+), 23 deletions(-) rename az_crowd_dc_node.yml => azure_crowd_dc_node.yml (87%) rename group_vars/{az_node_local.yml => azure_node_local.yml} (100%) delete mode 100644 roles/az_shared_fs_config/defaults/main.yml rename roles/{az_app_insights_install => azure_app_insights_install}/.yamllint (100%) rename roles/{az_app_insights_install => azure_app_insights_install}/defaults/main.yml (100%) rename roles/{az_app_insights_install => azure_app_insights_install}/handlers/main.yml (100%) rename roles/{az_app_insights_install => azure_app_insights_install}/molecule/default/Dockerfile.j2 (100%) rename roles/{az_app_insights_install => azure_app_insights_install}/molecule/default/molecule.yml (94%) rename roles/{az_app_insights_install => azure_app_insights_install}/molecule/default/playbook.yml (80%) rename roles/{az_app_insights_install => azure_app_insights_install}/molecule/default/tests/test_default.py (100%) rename roles/{az_app_insights_install => azure_app_insights_install}/tasks/main.yml (100%) rename roles/{az_app_insights_install => azure_app_insights_install}/templates/ApplicationInsights.xml.j2 (100%) rename roles/{az_app_insights_install => azure_app_insights_install}/templates/collectd.conf.j2 (100%) rename roles/{az_common => azure_common}/.yamllint (100%) rename roles/{az_common => azure_common}/molecule/default/Dockerfile.j2 (100%) rename roles/{az_common => azure_common}/molecule/default/molecule.yml (94%) rename roles/{az_common => azure_common}/molecule/default/playbook.yml (96%) rename roles/{az_common => azure_common}/molecule/default/tests/test_default.py (100%) rename roles/{az_common => azure_common}/tasks/main.yml (80%) create mode 100644 roles/azure_shared_fs_config/defaults/main.yml rename roles/{az_shared_fs_config => azure_shared_fs_config}/meta/main.yml (51%) rename roles/{az_shared_fs_config => azure_shared_fs_config}/tasks/main.yml (100%) diff --git a/az_crowd_dc_node.yml b/azure_crowd_dc_node.yml similarity index 87% rename from az_crowd_dc_node.yml rename to azure_crowd_dc_node.yml index 7d7077f..0577798 100644 --- a/az_crowd_dc_node.yml +++ b/azure_crowd_dc_node.yml @@ -1,5 +1,5 @@ --- -- hosts: az_node_local +- hosts: azure_node_local become: true vars: @@ -23,13 +23,13 @@ roles: - role: linux_common - - role: az_common - - role: az_shared_fs_config + - role: azure_common + - role: azure_shared_fs_config - role: product_common - role: product_install tags: [skip_on_stack_update] - role: database_init tags: [skip_on_stack_update] - role: crowd_config - - role: az_app_insights_install + - role: azure_app_insights_install - role: product_startup diff --git a/group_vars/az_node_local.yml b/group_vars/azure_node_local.yml similarity index 100% rename from group_vars/az_node_local.yml rename to group_vars/azure_node_local.yml diff --git a/inv/az_node_local b/inv/az_node_local index a51f637..801bd6f 100644 --- a/inv/az_node_local +++ b/inv/az_node_local @@ -1,2 +1,2 @@ -[az_node_local] +[azure_node_local] localhost ansible_connection=local \ No newline at end of file diff --git a/roles/az_shared_fs_config/defaults/main.yml b/roles/az_shared_fs_config/defaults/main.yml deleted file mode 100644 index cdaf96e..0000000 --- a/roles/az_shared_fs_config/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -az_storage_account: "{{ lookup('env', 'AZ_STORAGE_ACCOUNT') }}" -az_storage_key: "{{ lookup('env', 'AZ_STORAGE_KEY') }}" - -efs_target: "//{{ az_storage_account }}.file.core.windows.net" - -efs_type: "cifs" -efs_src_dir: "{{ lookup('env', 'ATL_CROWD_SHARED_HOME_NAME') or 'crowd-home' }}" -efs_mount_options: "vers=3.0,uid=0,gid=0,dir_mode=0777,file_mode=077,username={{ az_storage_account }},password={{ az_storage_key }}" \ No newline at end of file diff --git a/roles/az_app_insights_install/.yamllint b/roles/azure_app_insights_install/.yamllint similarity index 100% rename from roles/az_app_insights_install/.yamllint rename to roles/azure_app_insights_install/.yamllint diff --git a/roles/az_app_insights_install/defaults/main.yml b/roles/azure_app_insights_install/defaults/main.yml similarity index 100% rename from roles/az_app_insights_install/defaults/main.yml rename to roles/azure_app_insights_install/defaults/main.yml diff --git a/roles/az_app_insights_install/handlers/main.yml b/roles/azure_app_insights_install/handlers/main.yml similarity index 100% rename from roles/az_app_insights_install/handlers/main.yml rename to roles/azure_app_insights_install/handlers/main.yml diff --git a/roles/az_app_insights_install/molecule/default/Dockerfile.j2 b/roles/azure_app_insights_install/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/az_app_insights_install/molecule/default/Dockerfile.j2 rename to roles/azure_app_insights_install/molecule/default/Dockerfile.j2 diff --git a/roles/az_app_insights_install/molecule/default/molecule.yml b/roles/azure_app_insights_install/molecule/default/molecule.yml similarity index 94% rename from roles/az_app_insights_install/molecule/default/molecule.yml rename to roles/azure_app_insights_install/molecule/default/molecule.yml index 6f524b9..c3e6a36 100644 --- a/roles/az_app_insights_install/molecule/default/molecule.yml +++ b/roles/azure_app_insights_install/molecule/default/molecule.yml @@ -9,7 +9,7 @@ platforms: - name: ubuntu_lts image: ubuntu:bionic groups: - - az_node_local + - azure_node_local provisioner: name: ansible options: diff --git a/roles/az_app_insights_install/molecule/default/playbook.yml b/roles/azure_app_insights_install/molecule/default/playbook.yml similarity index 80% rename from roles/az_app_insights_install/molecule/default/playbook.yml rename to roles/azure_app_insights_install/molecule/default/playbook.yml index d1ba77a..f23b700 100644 --- a/roles/az_app_insights_install/molecule/default/playbook.yml +++ b/roles/azure_app_insights_install/molecule/default/playbook.yml @@ -8,7 +8,7 @@ atl_download_format: "tarball" roles: - role: linux_common - - role: az_common + - role: azure_common - role: product_common - role: product_install - - role: az_app_insights_install + - role: azure_app_insights_install diff --git a/roles/az_app_insights_install/molecule/default/tests/test_default.py b/roles/azure_app_insights_install/molecule/default/tests/test_default.py similarity index 100% rename from roles/az_app_insights_install/molecule/default/tests/test_default.py rename to roles/azure_app_insights_install/molecule/default/tests/test_default.py diff --git a/roles/az_app_insights_install/tasks/main.yml b/roles/azure_app_insights_install/tasks/main.yml similarity index 100% rename from roles/az_app_insights_install/tasks/main.yml rename to roles/azure_app_insights_install/tasks/main.yml diff --git a/roles/az_app_insights_install/templates/ApplicationInsights.xml.j2 b/roles/azure_app_insights_install/templates/ApplicationInsights.xml.j2 similarity index 100% rename from roles/az_app_insights_install/templates/ApplicationInsights.xml.j2 rename to roles/azure_app_insights_install/templates/ApplicationInsights.xml.j2 diff --git a/roles/az_app_insights_install/templates/collectd.conf.j2 b/roles/azure_app_insights_install/templates/collectd.conf.j2 similarity index 100% rename from roles/az_app_insights_install/templates/collectd.conf.j2 rename to roles/azure_app_insights_install/templates/collectd.conf.j2 diff --git a/roles/az_common/.yamllint b/roles/azure_common/.yamllint similarity index 100% rename from roles/az_common/.yamllint rename to roles/azure_common/.yamllint diff --git a/roles/az_common/molecule/default/Dockerfile.j2 b/roles/azure_common/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/az_common/molecule/default/Dockerfile.j2 rename to roles/azure_common/molecule/default/Dockerfile.j2 diff --git a/roles/az_common/molecule/default/molecule.yml b/roles/azure_common/molecule/default/molecule.yml similarity index 94% rename from roles/az_common/molecule/default/molecule.yml rename to roles/azure_common/molecule/default/molecule.yml index 6f524b9..c3e6a36 100644 --- a/roles/az_common/molecule/default/molecule.yml +++ b/roles/azure_common/molecule/default/molecule.yml @@ -9,7 +9,7 @@ platforms: - name: ubuntu_lts image: ubuntu:bionic groups: - - az_node_local + - azure_node_local provisioner: name: ansible options: diff --git a/roles/az_common/molecule/default/playbook.yml b/roles/azure_common/molecule/default/playbook.yml similarity index 96% rename from roles/az_common/molecule/default/playbook.yml rename to roles/azure_common/molecule/default/playbook.yml index 4ec86b7..a5f7690 100644 --- a/roles/az_common/molecule/default/playbook.yml +++ b/roles/azure_common/molecule/default/playbook.yml @@ -20,4 +20,4 @@ atl_proxy_port: "80" roles: - - role: az_common + - role: azure_common diff --git a/roles/az_common/molecule/default/tests/test_default.py b/roles/azure_common/molecule/default/tests/test_default.py similarity index 100% rename from roles/az_common/molecule/default/tests/test_default.py rename to roles/azure_common/molecule/default/tests/test_default.py diff --git a/roles/az_common/tasks/main.yml b/roles/azure_common/tasks/main.yml similarity index 80% rename from roles/az_common/tasks/main.yml rename to roles/azure_common/tasks/main.yml index 6aa7f74..8a9b740 100644 --- a/roles/az_common/tasks/main.yml +++ b/roles/azure_common/tasks/main.yml @@ -10,13 +10,13 @@ - name: Fetch VM ID command: "dmidecode -s system-uuid" - register: az_vm_id + register: azure_vm_id tags: - runtime_pkg changed_when: true - name: Use VM ID for cluster node ID set_fact: - atl_cluster_node_id: "{{ az_vm_id.stdout }}" + atl_cluster_node_id: "{{ azure_vm_id.stdout }}" tags: - runtime_pkg diff --git a/roles/azure_shared_fs_config/defaults/main.yml b/roles/azure_shared_fs_config/defaults/main.yml new file mode 100644 index 0000000..d4e3f71 --- /dev/null +++ b/roles/azure_shared_fs_config/defaults/main.yml @@ -0,0 +1,9 @@ +--- +azure_storage_account: "{{ lookup('env', 'AZURE_STORAGE_ACCOUNT') }}" +azure_storage_key: "{{ lookup('env', 'AZURE_STORAGE_KEY') }}" + +efs_target: "//{{ azure_storage_account }}.file.core.windows.net" + +efs_type: "cifs" +efs_src_dir: "{{ lookup('env', 'ATL_CROWD_SHARED_HOME_NAME') or 'crowd-home' }}" +efs_mount_options: "vers=3.0,uid=0,gid=0,dir_mode=0777,file_mode=077,username={{ azure_storage_account }},password={{ azure_storage_key }}" \ No newline at end of file diff --git a/roles/az_shared_fs_config/meta/main.yml b/roles/azure_shared_fs_config/meta/main.yml similarity index 51% rename from roles/az_shared_fs_config/meta/main.yml rename to roles/azure_shared_fs_config/meta/main.yml index f287b03..38c2774 100644 --- a/roles/az_shared_fs_config/meta/main.yml +++ b/roles/azure_shared_fs_config/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - az_common + - azure_common diff --git a/roles/az_shared_fs_config/tasks/main.yml b/roles/azure_shared_fs_config/tasks/main.yml similarity index 100% rename from roles/az_shared_fs_config/tasks/main.yml rename to roles/azure_shared_fs_config/tasks/main.yml diff --git a/roles/product_install/molecule/crowd_latest/molecule.yml b/roles/product_install/molecule/crowd_latest/molecule.yml index 0975eea..132c3fb 100644 --- a/roles/product_install/molecule/crowd_latest/molecule.yml +++ b/roles/product_install/molecule/crowd_latest/molecule.yml @@ -17,7 +17,7 @@ platforms: - name: ubuntu_lts_azure image: ubuntu:bionic groups: - - az_node_local + - azure_node_local provisioner: name: ansible options: