Rename conjur_host_identity to conjur-host-identity

Uniform with naming scheme used in documentation, and used by the standalone cyberark.conjur-host-identity Role.
cyberark · Dec 22, 2021 · 812116b · 812116b
1 parent d2d5f3b
commit 812116b
Show file tree

Hide file tree

Showing 32 changed files with 23 additions and 17 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -27,10 +27,10 @@ pipeline {
           }
         }
 
-        stage("Test conjur_host_identity role") {
+        stage("Test conjur-host-identity role") {
           steps {
-            sh './ci/test.sh -d conjur_host_identity'
-            junit 'roles/conjur_host_identity/tests/junit/*'
+            sh './ci/test.sh -d conjur-host-identity'
+            junit 'roles/conjur-host-identity/tests/junit/*'
           }
         }
       }

diff --git a/ci/test.sh b/ci/test.sh
@@ -6,7 +6,7 @@
 test_directories=("conjur_variable")
 
 # Roles containing a test subdirectory
-role_directories=("conjur_host_identity")
+role_directories=("conjur-host-identity")
 
 # Target directory that can be manually set by passing a value to the `-d` flag
 target=""

diff --git a/roles/conjur_host_identity/README.md → roles/conjur-host-identity/README.md b/roles/conjur_host_identity/README.md → roles/conjur-host-identity/README.md
diff --git a/roles/conjur_host_identity/defaults/main.yml → roles/conjur-host-identity/defaults/main.yml b/roles/conjur_host_identity/defaults/main.yml → roles/conjur-host-identity/defaults/main.yml
diff --git a/roles/conjur_host_identity/meta/main.yml → roles/conjur-host-identity/meta/main.yml b/roles/conjur_host_identity/meta/main.yml → roles/conjur-host-identity/meta/main.yml
diff --git a/...s/conjur_host_identity/tasks/identity.yml → ...s/conjur-host-identity/tasks/identity.yml b/...s/conjur_host_identity/tasks/identity.yml → ...s/conjur-host-identity/tasks/identity.yml
diff --git a/...ur_host_identity/tasks/identity_check.yml → ...ur-host-identity/tasks/identity_check.yml b/...ur_host_identity/tasks/identity_check.yml → ...ur-host-identity/tasks/identity_check.yml
diff --git a/roles/conjur_host_identity/tasks/main.yml → roles/conjur-host-identity/tasks/main.yml b/roles/conjur_host_identity/tasks/main.yml → roles/conjur-host-identity/tasks/main.yml
diff --git a/...jur_host_identity/tasks/summon-conjur.yml → ...jur-host-identity/tasks/summon-conjur.yml b/...jur_host_identity/tasks/summon-conjur.yml → ...jur-host-identity/tasks/summon-conjur.yml
diff --git a/roles/conjur_host_identity/tasks/summon.yml → roles/conjur-host-identity/tasks/summon.yml b/roles/conjur_host_identity/tasks/summon.yml → roles/conjur-host-identity/tasks/summon.yml
diff --git a/...ur_host_identity/templates/conjur.conf.j2 → ...ur-host-identity/templates/conjur.conf.j2 b/...ur_host_identity/templates/conjur.conf.j2 → ...ur-host-identity/templates/conjur.conf.j2
diff --git a/...ost_identity/templates/conjur.identity.j2 → ...ost-identity/templates/conjur.identity.j2 b/...ost_identity/templates/conjur.identity.j2 → ...ost-identity/templates/conjur.identity.j2
diff --git a/roles/conjur_host_identity/tests/Dockerfile → roles/conjur-host-identity/tests/Dockerfile b/roles/conjur_host_identity/tests/Dockerfile → roles/conjur-host-identity/tests/Dockerfile
@@ -41,6 +41,12 @@ RUN apt-get update && apt-get install -y gcc build-essential
 RUN apt-add-repository -y ppa:brightbox/ruby-ng && apt-get update && apt-get install -y ruby2.4 ruby2.4-dev
 RUN gem install conjur-cli
 
-# install Ansible Conjur Collection
-RUN ansible-galaxy collection install cyberark.conjur && \
-    ansible-galaxy install cyberark.conjur-host-identity
+# install Conjur Collection and Conjur Role
+# RUN ansible-galaxy collection install cyberark.conjur && \
+#     ansible-galaxy install cyberark.conjur-host-identity
+
+# while the module name-change is unreleased, install Collection from git branch
+RUN ansible-galaxy install cyberark.conjur-host-identity && \
+    git clone https://github.com/cyberark/ansible-conjur-collection.git --branch installation-bug-2-9 --single-branch && \
+    ansible-galaxy collection build ./ansible-conjur-collection && \
+    ansible-galaxy collection install ./cyberark-conjur-1.1.0.tar.gz
diff --git a/...njur_host_identity/tests/Dockerfile_nginx → ...njur-host-identity/tests/Dockerfile_nginx b/...njur_host_identity/tests/Dockerfile_nginx → ...njur-host-identity/tests/Dockerfile_nginx
diff --git a/roles/conjur_host_identity/tests/ansible.cfg → roles/conjur-host-identity/tests/ansible.cfg b/roles/conjur_host_identity/tests/ansible.cfg → roles/conjur-host-identity/tests/ansible.cfg
diff --git a/...ur_host_identity/tests/docker-compose.yml → ...ur-host-identity/tests/docker-compose.yml b/...ur_host_identity/tests/docker-compose.yml → ...ur-host-identity/tests/docker-compose.yml
diff --git a/...ost_identity/tests/inventory-playbook.yml → ...ost-identity/tests/inventory-playbook.yml b/...ost_identity/tests/inventory-playbook.yml → ...ost-identity/tests/inventory-playbook.yml
diff --git a/...s/conjur_host_identity/tests/inventory.j2 → ...s/conjur-host-identity/tests/inventory.j2 b/...s/conjur_host_identity/tests/inventory.j2 → ...s/conjur-host-identity/tests/inventory.j2
diff --git a/...onjur_host_identity/tests/policy/root.yml → ...onjur-host-identity/tests/policy/root.yml b/...onjur_host_identity/tests/policy/root.yml → ...onjur-host-identity/tests/policy/root.yml
diff --git a/...ur_host_identity/tests/proxy/default.conf → ...ur-host-identity/tests/proxy/default.conf b/...ur_host_identity/tests/proxy/default.conf → ...ur-host-identity/tests/proxy/default.conf
diff --git a/...conjur_host_identity/tests/proxy/ssl.conf → ...conjur-host-identity/tests/proxy/ssl.conf b/...conjur_host_identity/tests/proxy/ssl.conf → ...conjur-host-identity/tests/proxy/ssl.conf
diff --git a/roles/conjur_host_identity/tests/test.sh → roles/conjur-host-identity/tests/test.sh b/roles/conjur_host_identity/tests/test.sh → roles/conjur-host-identity/tests/test.sh
diff --git a/...identity/tests/test_app_centos/Dockerfile → ...identity/tests/test_app_centos/Dockerfile b/...identity/tests/test_app_centos/Dockerfile → ...identity/tests/test_app_centos/Dockerfile
diff --git a/...identity/tests/test_app_ubuntu/Dockerfile → ...identity/tests/test_app_ubuntu/Dockerfile b/...identity/tests/test_app_ubuntu/Dockerfile → ...identity/tests/test_app_ubuntu/Dockerfile
diff --git a/...y/tests/test_cases/common/test_default.py → ...y/tests/test_cases/common/test_default.py b/...y/tests/test_cases/common/test_default.py → ...y/tests/test_cases/common/test_default.py
diff --git a/...jur-identity-from-collection/playbook.yml → ...jur-identity-from-collection/playbook.yml b/...jur-identity-from-collection/playbook.yml → ...jur-identity-from-collection/playbook.yml
@@ -2,7 +2,7 @@
 - name: Configuring conjur identity on remote hosts
   hosts: testapp
   roles:
-    - role: cyberark.conjur.conjur_host_identity
+    - role: cyberark.conjur.conjur-host-identity
       conjur_account: cucumber
       conjur_appliance_url: "https://conjur-proxy-nginx"
       conjur_host_factory_token: "{{lookup('env', 'HFTOKEN')}}"

diff --git a/...re-conjur-identity-from-role/playbook.yml → ...re-conjur-identity-from-role/playbook.yml b/...re-conjur-identity-from-role/playbook.yml → ...re-conjur-identity-from-role/playbook.yml
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
@@ -1,8 +1,8 @@
 Jenkinsfile shebang
 tests/conjur_variable/test.sh shebang
 tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml
-roles/conjur_host_identity/tests/test.sh shebang
-roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by summon utility (in Jenkinsfile), not via Python
+roles/conjur-host-identity/tests/test.sh shebang
+roles/conjur-host-identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by summon utility (in Jenkinsfile), not via Python
 ci/build_release shebang
 ci/parse-changelog.sh shebang
 ci/publish_to_galaxy shebang

diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
@@ -1,8 +1,8 @@
 Jenkinsfile shebang
 tests/conjur_variable/test.sh shebang
 tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml
-roles/conjur_host_identity/tests/test.sh shebang
-roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by summon utility (in Jenkinsfile), not via Python
+roles/conjur-host-identity/tests/test.sh shebang
+roles/conjur-host-identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by summon utility (in Jenkinsfile), not via Python
 ci/build_release shebang
 ci/parse-changelog.sh shebang
 ci/publish_to_galaxy shebang

diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt
@@ -1,8 +1,8 @@
 Jenkinsfile shebang
 tests/conjur_variable/test.sh shebang
 tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
-roles/conjur_host_identity/tests/test.sh shebang
-roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
+roles/conjur-host-identity/tests/test.sh shebang
+roles/conjur-host-identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
 ci/build_release shebang
 ci/parse-changelog.sh shebang
 ci/publish_to_galaxy shebang

diff --git a/tests/sanity/ignore-2.13.txt b/tests/sanity/ignore-2.13.txt
@@ -1,8 +1,8 @@
 Jenkinsfile shebang
 tests/conjur_variable/test.sh shebang
 tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
-roles/conjur_host_identity/tests/test.sh shebang
-roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
+roles/conjur-host-identity/tests/test.sh shebang
+roles/conjur-host-identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
 ci/build_release shebang
 ci/parse-changelog.sh shebang
 ci/publish_to_galaxy shebang

diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
@@ -1,6 +1,6 @@
 Jenkinsfile shebang
 tests/conjur_variable/test.sh shebang
-roles/conjur_host_identity/tests/test.sh shebang
+roles/conjur-host-identity/tests/test.sh shebang
 ci/build_release shebang
 ci/parse-changelog.sh shebang
 ci/publish_to_galaxy shebang