From b349c5312bea4657d270cc55c9ffeecd16cebd0f Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 20 Jan 2020 08:15:57 -0700 Subject: [PATCH] Rename roles to use underscore It appears that '-' is not valid in role names in collections per https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#roles-directory Change-Id: Id472a75ed71170208acc7cfbc79f7ad18945ea67 --- roles/README.md | 4 +- roles/tripleo-config-generate-ansible | 1 + roles/tripleo-container-image-delete | 1 + roles/tripleo-container-image-list | 1 + roles/tripleo-container-image-prepare-default | 1 + roles/tripleo-container-image-push | 1 + roles/tripleo-container-image-show | 1 + roles/tripleo-repos | 1 + roles/tripleo-repos/handlers/main.yml | 2 - roles/tripleo-repos/vars/main.yml | 2 - roles/tripleo-undercloud-backup | 1 + roles/tripleo-undercloud-install | 1 + roles/tripleo-undercloud-minion-install | 1 + .../tests/test.yml | 5 --- roles/tripleo-undercloud-minion-upgrade | 1 + .../meta/main.yml | 42 ------------------- .../tests/test.yml | 5 --- roles/tripleo-undercloud-upgrade | 1 + .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 0 .../tests/inventory | 0 .../tests/test.yml | 2 +- .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 2 +- .../tests/inventory | 0 .../tests/test.yml | 2 +- .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 2 +- .../tests/inventory | 0 .../tests/test.yml | 2 +- .../README.md | 4 +- .../defaults/main.yml | 0 .../meta/main.yml | 2 +- .../tasks/main.yml | 2 +- .../tests/inventory | 0 .../tests/test.yml | 2 +- .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 2 +- .../tests/inventory | 0 .../tests/test.yml | 2 +- .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 2 +- .../tests/inventory | 0 .../tests/test.yml | 2 +- .../README.md | 10 ++--- .../defaults/main.yml | 2 +- roles/tripleo_repos/handlers/main.yml | 2 + .../meta/main.yml | 2 +- .../tasks/install.yml | 8 ++-- .../tasks/main.yml | 12 +++--- .../tests/inventory | 0 .../tests/test.yml | 2 +- roles/tripleo_repos/vars/main.yml | 2 + .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 0 .../tests/inventory | 0 .../tests/test.yml | 2 +- .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 0 .../tests/inventory | 0 .../tests/test.yml | 2 +- .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 42 +++++++++++++++++++ .../tasks/main.yml | 0 .../tests/inventory | 0 .../tests/test.yml | 5 +++ .../README.md | 4 +- .../defaults/main.yml | 2 +- .../meta/main.yml | 0 .../tasks/main.yml | 0 .../tests/inventory | 0 .../tests/test.yml | 5 +++ .../README.md | 4 +- .../defaults/main.yml | 0 .../meta/main.yml | 2 +- .../tasks/main.yml | 0 .../tests/inventory | 0 .../tests/test.yml | 2 +- setup.cfg | 13 ++++++ zuul.d/layout.yaml | 2 +- 95 files changed, 156 insertions(+), 131 deletions(-) create mode 120000 roles/tripleo-config-generate-ansible create mode 120000 roles/tripleo-container-image-delete create mode 120000 roles/tripleo-container-image-list create mode 120000 roles/tripleo-container-image-prepare-default create mode 120000 roles/tripleo-container-image-push create mode 120000 roles/tripleo-container-image-show create mode 120000 roles/tripleo-repos delete mode 100644 roles/tripleo-repos/handlers/main.yml delete mode 100644 roles/tripleo-repos/vars/main.yml create mode 120000 roles/tripleo-undercloud-backup create mode 120000 roles/tripleo-undercloud-install create mode 120000 roles/tripleo-undercloud-minion-install delete mode 100644 roles/tripleo-undercloud-minion-install/tests/test.yml create mode 120000 roles/tripleo-undercloud-minion-upgrade delete mode 100644 roles/tripleo-undercloud-minion-upgrade/meta/main.yml delete mode 100644 roles/tripleo-undercloud-minion-upgrade/tests/test.yml create mode 120000 roles/tripleo-undercloud-upgrade rename roles/{tripleo-config-generate-ansible => tripleo_config_generate_ansible}/README.md (94%) rename roles/{tripleo-config-generate-ansible => tripleo_config_generate_ansible}/defaults/main.yml (87%) rename roles/{tripleo-config-generate-ansible => tripleo_config_generate_ansible}/meta/main.yml (95%) rename roles/{tripleo-config-generate-ansible => tripleo_config_generate_ansible}/tasks/main.yml (100%) rename roles/{tripleo-config-generate-ansible => tripleo_config_generate_ansible}/tests/inventory (100%) rename roles/{tripleo-config-generate-ansible => tripleo_config_generate_ansible}/tests/test.yml (57%) rename roles/{tripleo-container-image-delete => tripleo_container_image_delete}/README.md (94%) rename roles/{tripleo-container-image-delete => tripleo_container_image_delete}/defaults/main.yml (83%) rename roles/{tripleo-container-image-delete => tripleo_container_image_delete}/meta/main.yml (95%) rename roles/{tripleo-container-image-delete => tripleo_container_image_delete}/tasks/main.yml (95%) rename roles/{tripleo-container-image-delete => tripleo_container_image_delete}/tests/inventory (100%) rename roles/{tripleo-container-image-delete => tripleo_container_image_delete}/tests/test.yml (58%) rename roles/{tripleo-container-image-list => tripleo_container_image_list}/README.md (95%) rename roles/{tripleo-container-image-list => tripleo_container_image_list}/defaults/main.yml (80%) rename roles/{tripleo-container-image-list => tripleo_container_image_list}/meta/main.yml (95%) rename roles/{tripleo-container-image-list => tripleo_container_image_list}/tasks/main.yml (95%) rename roles/{tripleo-container-image-list => tripleo_container_image_list}/tests/inventory (100%) rename roles/{tripleo-container-image-list => tripleo_container_image_list}/tests/test.yml (59%) rename roles/{tripleo-container-image-prepare-default => tripleo_container_image_prepare_default}/README.md (93%) rename roles/{tripleo-container-image-prepare-default => tripleo_container_image_prepare_default}/defaults/main.yml (100%) rename roles/{tripleo-container-image-prepare-default => tripleo_container_image_prepare_default}/meta/main.yml (93%) rename roles/{tripleo-container-image-prepare-default => tripleo_container_image_prepare_default}/tasks/main.yml (93%) rename roles/{tripleo-container-image-prepare-default => tripleo_container_image_prepare_default}/tests/inventory (100%) rename roles/{tripleo-container-image-prepare-default => tripleo_container_image_prepare_default}/tests/test.yml (77%) rename roles/{tripleo-container-image-push => tripleo_container_image_push}/README.md (96%) rename roles/{tripleo-container-image-push => tripleo_container_image_push}/defaults/main.yml (90%) rename roles/{tripleo-container-image-push => tripleo_container_image_push}/meta/main.yml (95%) rename roles/{tripleo-container-image-push => tripleo_container_image_push}/tasks/main.yml (96%) rename roles/{tripleo-container-image-push => tripleo_container_image_push}/tests/inventory (100%) rename roles/{tripleo-container-image-push => tripleo_container_image_push}/tests/test.yml (78%) rename roles/{tripleo-container-image-show => tripleo_container_image_show}/README.md (95%) rename roles/{tripleo-container-image-show => tripleo_container_image_show}/defaults/main.yml (77%) rename roles/{tripleo-container-image-show => tripleo_container_image_show}/meta/main.yml (95%) rename roles/{tripleo-container-image-show => tripleo_container_image_show}/tasks/main.yml (95%) rename roles/{tripleo-container-image-show => tripleo_container_image_show}/tests/inventory (100%) rename roles/{tripleo-container-image-show => tripleo_container_image_show}/tests/test.yml (78%) rename roles/{tripleo-repos => tripleo_repos}/README.md (85%) rename roles/{tripleo-repos => tripleo_repos}/defaults/main.yml (84%) create mode 100644 roles/tripleo_repos/handlers/main.yml rename roles/{tripleo-repos => tripleo_repos}/meta/main.yml (95%) rename roles/{tripleo-repos => tripleo_repos}/tasks/install.yml (82%) rename roles/{tripleo-repos => tripleo_repos}/tasks/main.yml (75%) rename roles/{tripleo-repos => tripleo_repos}/tests/inventory (100%) rename roles/{tripleo-repos => tripleo_repos}/tests/test.yml (72%) create mode 100644 roles/tripleo_repos/vars/main.yml rename roles/{tripleo-undercloud-backup => tripleo_undercloud_backup}/README.md (95%) rename roles/{tripleo-undercloud-backup => tripleo_undercloud_backup}/defaults/main.yml (89%) rename roles/{tripleo-undercloud-backup => tripleo_undercloud_backup}/meta/main.yml (95%) rename roles/{tripleo-undercloud-backup => tripleo_undercloud_backup}/tasks/main.yml (100%) rename roles/{tripleo-undercloud-backup => tripleo_undercloud_backup}/tests/inventory (100%) rename roles/{tripleo-undercloud-backup => tripleo_undercloud_backup}/tests/test.yml (61%) rename roles/{tripleo-undercloud-install => tripleo_undercloud_install}/README.md (96%) rename roles/{tripleo-undercloud-install => tripleo_undercloud_install}/defaults/main.yml (92%) rename roles/{tripleo-undercloud-install => tripleo_undercloud_install}/meta/main.yml (95%) rename roles/{tripleo-undercloud-install => tripleo_undercloud_install}/tasks/main.yml (100%) rename roles/{tripleo-undercloud-install => tripleo_undercloud_install}/tests/inventory (100%) rename roles/{tripleo-undercloud-install => tripleo_undercloud_install}/tests/test.yml (61%) rename roles/{tripleo-undercloud-minion-install => tripleo_undercloud_minion_install}/README.md (95%) rename roles/{tripleo-undercloud-minion-install => tripleo_undercloud_minion_install}/defaults/main.yml (91%) create mode 100644 roles/tripleo_undercloud_minion_install/meta/main.yml rename roles/{tripleo-undercloud-minion-install => tripleo_undercloud_minion_install}/tasks/main.yml (100%) rename roles/{tripleo-undercloud-minion-install => tripleo_undercloud_minion_install}/tests/inventory (100%) create mode 100644 roles/tripleo_undercloud_minion_install/tests/test.yml rename roles/{tripleo-undercloud-minion-upgrade => tripleo_undercloud_minion_upgrade}/README.md (95%) rename roles/{tripleo-undercloud-minion-upgrade => tripleo_undercloud_minion_upgrade}/defaults/main.yml (91%) rename roles/{tripleo-undercloud-minion-install => tripleo_undercloud_minion_upgrade}/meta/main.yml (100%) rename roles/{tripleo-undercloud-minion-upgrade => tripleo_undercloud_minion_upgrade}/tasks/main.yml (100%) rename roles/{tripleo-undercloud-minion-upgrade => tripleo_undercloud_minion_upgrade}/tests/inventory (100%) create mode 100644 roles/tripleo_undercloud_minion_upgrade/tests/test.yml rename roles/{tripleo-undercloud-upgrade => tripleo_undercloud_upgrade}/README.md (96%) rename roles/{tripleo-undercloud-upgrade => tripleo_undercloud_upgrade}/defaults/main.yml (100%) rename roles/{tripleo-undercloud-upgrade => tripleo_undercloud_upgrade}/meta/main.yml (95%) rename roles/{tripleo-undercloud-upgrade => tripleo_undercloud_upgrade}/tasks/main.yml (100%) rename roles/{tripleo-undercloud-upgrade => tripleo_undercloud_upgrade}/tests/inventory (100%) rename roles/{tripleo-undercloud-upgrade => tripleo_undercloud_upgrade}/tests/test.yml (61%) diff --git a/roles/README.md b/roles/README.md index 8ae23d2..b29e50a 100644 --- a/roles/README.md +++ b/roles/README.md @@ -45,7 +45,7 @@ Example undercloud installation - name: Configure tripleo repositories import_role: - name: tripleo-repos + name: tripleo_repos - name: Install python2 tripleoclient package: @@ -82,7 +82,7 @@ Example undercloud installation - name: Install undercloud import_role: - name: tripleo-undercloud-install + name: tripleo_undercloud_install vars: tripleo_undercloud_install_debug: true diff --git a/roles/tripleo-config-generate-ansible b/roles/tripleo-config-generate-ansible new file mode 120000 index 0000000..07e5ea1 --- /dev/null +++ b/roles/tripleo-config-generate-ansible @@ -0,0 +1 @@ +tripleo_config_generate_ansible \ No newline at end of file diff --git a/roles/tripleo-container-image-delete b/roles/tripleo-container-image-delete new file mode 120000 index 0000000..f84c2a3 --- /dev/null +++ b/roles/tripleo-container-image-delete @@ -0,0 +1 @@ +tripleo_container_image_delete \ No newline at end of file diff --git a/roles/tripleo-container-image-list b/roles/tripleo-container-image-list new file mode 120000 index 0000000..8c8c1b8 --- /dev/null +++ b/roles/tripleo-container-image-list @@ -0,0 +1 @@ +tripleo_container_image_list \ No newline at end of file diff --git a/roles/tripleo-container-image-prepare-default b/roles/tripleo-container-image-prepare-default new file mode 120000 index 0000000..0df8634 --- /dev/null +++ b/roles/tripleo-container-image-prepare-default @@ -0,0 +1 @@ +tripleo_container_image_prepare_default \ No newline at end of file diff --git a/roles/tripleo-container-image-push b/roles/tripleo-container-image-push new file mode 120000 index 0000000..f250ee9 --- /dev/null +++ b/roles/tripleo-container-image-push @@ -0,0 +1 @@ +tripleo_container_image_push \ No newline at end of file diff --git a/roles/tripleo-container-image-show b/roles/tripleo-container-image-show new file mode 120000 index 0000000..5605ff0 --- /dev/null +++ b/roles/tripleo-container-image-show @@ -0,0 +1 @@ +tripleo_container_image_show \ No newline at end of file diff --git a/roles/tripleo-repos b/roles/tripleo-repos new file mode 120000 index 0000000..f962d75 --- /dev/null +++ b/roles/tripleo-repos @@ -0,0 +1 @@ +tripleo_repos \ No newline at end of file diff --git a/roles/tripleo-repos/handlers/main.yml b/roles/tripleo-repos/handlers/main.yml deleted file mode 100644 index be48023..0000000 --- a/roles/tripleo-repos/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for tripleo-repos diff --git a/roles/tripleo-repos/vars/main.yml b/roles/tripleo-repos/vars/main.yml deleted file mode 100644 index d2cc024..0000000 --- a/roles/tripleo-repos/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for tripleo-repos diff --git a/roles/tripleo-undercloud-backup b/roles/tripleo-undercloud-backup new file mode 120000 index 0000000..6595c77 --- /dev/null +++ b/roles/tripleo-undercloud-backup @@ -0,0 +1 @@ +tripleo_undercloud_backup \ No newline at end of file diff --git a/roles/tripleo-undercloud-install b/roles/tripleo-undercloud-install new file mode 120000 index 0000000..eebb942 --- /dev/null +++ b/roles/tripleo-undercloud-install @@ -0,0 +1 @@ +tripleo_undercloud_install \ No newline at end of file diff --git a/roles/tripleo-undercloud-minion-install b/roles/tripleo-undercloud-minion-install new file mode 120000 index 0000000..615b065 --- /dev/null +++ b/roles/tripleo-undercloud-minion-install @@ -0,0 +1 @@ +tripleo_undercloud_minion_install \ No newline at end of file diff --git a/roles/tripleo-undercloud-minion-install/tests/test.yml b/roles/tripleo-undercloud-minion-install/tests/test.yml deleted file mode 100644 index 69681f0..0000000 --- a/roles/tripleo-undercloud-minion-install/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - tripleo-undercloud-minion-install diff --git a/roles/tripleo-undercloud-minion-upgrade b/roles/tripleo-undercloud-minion-upgrade new file mode 120000 index 0000000..8c201de --- /dev/null +++ b/roles/tripleo-undercloud-minion-upgrade @@ -0,0 +1 @@ +tripleo_undercloud_minion_upgrade \ No newline at end of file diff --git a/roles/tripleo-undercloud-minion-upgrade/meta/main.yml b/roles/tripleo-undercloud-minion-upgrade/meta/main.yml deleted file mode 100644 index 8185f5b..0000000 --- a/roles/tripleo-undercloud-minion-upgrade/meta/main.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Copyright 2019 Red Hat, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -galaxy_info: - author: OpenStack - description: TripleO Operator Role -- tripleo-undercloud-minion-install - company: Red Hat - license: Apache-2.0 - min_ansible_version: 2.8 - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - platforms: - - name: CentOS - versions: - - 7 - - 8 - - galaxy_tags: - - tripleo - - -# List your role dependencies here, one per line. Be sure to remove the '[]' above, -# if you add dependencies to this list. -dependencies: [] diff --git a/roles/tripleo-undercloud-minion-upgrade/tests/test.yml b/roles/tripleo-undercloud-minion-upgrade/tests/test.yml deleted file mode 100644 index 76270cd..0000000 --- a/roles/tripleo-undercloud-minion-upgrade/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - tripleo-undercloud-minion-upgrade diff --git a/roles/tripleo-undercloud-upgrade b/roles/tripleo-undercloud-upgrade new file mode 120000 index 0000000..384e3d7 --- /dev/null +++ b/roles/tripleo-undercloud-upgrade @@ -0,0 +1 @@ +tripleo_undercloud_upgrade \ No newline at end of file diff --git a/roles/tripleo-config-generate-ansible/README.md b/roles/tripleo_config_generate_ansible/README.md similarity index 94% rename from roles/tripleo-config-generate-ansible/README.md rename to roles/tripleo_config_generate_ansible/README.md index b5f3f6d..f6cc49c 100644 --- a/roles/tripleo-config-generate-ansible/README.md +++ b/roles/tripleo_config_generate_ansible/README.md @@ -1,4 +1,4 @@ -tripleo-config-generate-ansible +tripleo_config_generate_ansible =============================== A role to generate the default ansible.cfg for a deployment. @@ -38,7 +38,7 @@ Example install execution playbook tasks: - name: Generate default ansible config import_role: - name: tripleo-config-generate-ansible + name: tripleo_config_generate_ansible License ------- diff --git a/roles/tripleo-config-generate-ansible/defaults/main.yml b/roles/tripleo_config_generate_ansible/defaults/main.yml similarity index 87% rename from roles/tripleo-config-generate-ansible/defaults/main.yml rename to roles/tripleo_config_generate_ansible/defaults/main.yml index 003d521..1aa111e 100644 --- a/roles/tripleo-config-generate-ansible/defaults/main.yml +++ b/roles/tripleo_config_generate_ansible/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-config-generate-ansible +# defaults file for tripleo_config_generate_ansible tripleo_config_generate_ansible_debug: false tripleo_config_generate_ansible_deployment_user: "{{ ansible_user }}" tripleo_config_generate_ansible_os_cloud: "{{ tripleo_os_cloud | default('') }}" diff --git a/roles/tripleo-config-generate-ansible/meta/main.yml b/roles/tripleo_config_generate_ansible/meta/main.yml similarity index 95% rename from roles/tripleo-config-generate-ansible/meta/main.yml rename to roles/tripleo_config_generate_ansible/meta/main.yml index 8248b44..61fbbd9 100644 --- a/roles/tripleo-config-generate-ansible/meta/main.yml +++ b/roles/tripleo_config_generate_ansible/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-config-generate-ansible + description: TripleO Operator Role -- tripleo_config_generate_ansible company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-config-generate-ansible/tasks/main.yml b/roles/tripleo_config_generate_ansible/tasks/main.yml similarity index 100% rename from roles/tripleo-config-generate-ansible/tasks/main.yml rename to roles/tripleo_config_generate_ansible/tasks/main.yml diff --git a/roles/tripleo-config-generate-ansible/tests/inventory b/roles/tripleo_config_generate_ansible/tests/inventory similarity index 100% rename from roles/tripleo-config-generate-ansible/tests/inventory rename to roles/tripleo_config_generate_ansible/tests/inventory diff --git a/roles/tripleo-config-generate-ansible/tests/test.yml b/roles/tripleo_config_generate_ansible/tests/test.yml similarity index 57% rename from roles/tripleo-config-generate-ansible/tests/test.yml rename to roles/tripleo_config_generate_ansible/tests/test.yml index da14791..a629c70 100644 --- a/roles/tripleo-config-generate-ansible/tests/test.yml +++ b/roles/tripleo_config_generate_ansible/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - tripleo-config-generate-ansible + - tripleo_config_generate_ansible diff --git a/roles/tripleo-container-image-delete/README.md b/roles/tripleo_container_image_delete/README.md similarity index 94% rename from roles/tripleo-container-image-delete/README.md rename to roles/tripleo_container_image_delete/README.md index 11e0b36..ad6fdfe 100644 --- a/roles/tripleo-container-image-delete/README.md +++ b/roles/tripleo_container_image_delete/README.md @@ -1,4 +1,4 @@ -tripleo-container-image-delete +tripleo_container_image_delete ============================== A role to perform the container image delete against a registry. @@ -39,7 +39,7 @@ Example container delete execution playbook tasks: - name: Delete containers import_role: - name: tripleo-container-image-delete + name: tripleo_container_image_delete var: tripleo_container_image_delete_image: undercloud.ctlplane.localdomain:8787/library/centos:7 diff --git a/roles/tripleo-container-image-delete/defaults/main.yml b/roles/tripleo_container_image_delete/defaults/main.yml similarity index 83% rename from roles/tripleo-container-image-delete/defaults/main.yml rename to roles/tripleo_container_image_delete/defaults/main.yml index 5ffa1c6..38d53c3 100644 --- a/roles/tripleo-container-image-delete/defaults/main.yml +++ b/roles/tripleo_container_image_delete/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-container-image-delete +# defaults file for tripleo_container_image_delete tripleo_container_image_delete_become: true tripleo_container_image_delete_debug: false tripleo_container_image_delete_password: diff --git a/roles/tripleo-container-image-delete/meta/main.yml b/roles/tripleo_container_image_delete/meta/main.yml similarity index 95% rename from roles/tripleo-container-image-delete/meta/main.yml rename to roles/tripleo_container_image_delete/meta/main.yml index 3d7db89..7d15326 100644 --- a/roles/tripleo-container-image-delete/meta/main.yml +++ b/roles/tripleo_container_image_delete/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-container-image-delete + description: TripleO Operator Role -- tripleo_container_image_delete company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-container-image-delete/tasks/main.yml b/roles/tripleo_container_image_delete/tasks/main.yml similarity index 95% rename from roles/tripleo-container-image-delete/tasks/main.yml rename to roles/tripleo_container_image_delete/tasks/main.yml index 9439178..a77b77c 100644 --- a/roles/tripleo-container-image-delete/tasks/main.yml +++ b/roles/tripleo_container_image_delete/tasks/main.yml @@ -1,5 +1,5 @@ --- -# tasks file for tripleo-container-image-delete +# tasks file for tripleo_container_image_delete - name: Setup container image delete facts set_fact: _delete_cmd: >- diff --git a/roles/tripleo-container-image-delete/tests/inventory b/roles/tripleo_container_image_delete/tests/inventory similarity index 100% rename from roles/tripleo-container-image-delete/tests/inventory rename to roles/tripleo_container_image_delete/tests/inventory diff --git a/roles/tripleo-container-image-delete/tests/test.yml b/roles/tripleo_container_image_delete/tests/test.yml similarity index 58% rename from roles/tripleo-container-image-delete/tests/test.yml rename to roles/tripleo_container_image_delete/tests/test.yml index 4d79280..2528e73 100644 --- a/roles/tripleo-container-image-delete/tests/test.yml +++ b/roles/tripleo_container_image_delete/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - tripleo-container-image-delete + - tripleo_container_image_delete diff --git a/roles/tripleo-container-image-list/README.md b/roles/tripleo_container_image_list/README.md similarity index 95% rename from roles/tripleo-container-image-list/README.md rename to roles/tripleo_container_image_list/README.md index b68f19e..75d6dfd 100644 --- a/roles/tripleo-container-image-list/README.md +++ b/roles/tripleo_container_image_list/README.md @@ -1,4 +1,4 @@ -tripleo-container-image-list +tripleo_container_image_list ============================ A role to perform the container image list against a registry. @@ -38,7 +38,7 @@ Example container list execution playbook tasks: - name: List containers import_role: - name: tripleo-container-image-list + name: tripleo_container_image_list - name: Print containers debug: msg: "{{ item['Image Name'] }}" diff --git a/roles/tripleo-container-image-list/defaults/main.yml b/roles/tripleo_container_image_list/defaults/main.yml similarity index 80% rename from roles/tripleo-container-image-list/defaults/main.yml rename to roles/tripleo_container_image_list/defaults/main.yml index 0afd9f8..48daeff 100644 --- a/roles/tripleo-container-image-list/defaults/main.yml +++ b/roles/tripleo_container_image_list/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-container-image-list +# defaults file for tripleo_container_image_list tripleo_container_image_list_debug: false tripleo_container_image_list_format: json tripleo_container_image_list_password: diff --git a/roles/tripleo-container-image-list/meta/main.yml b/roles/tripleo_container_image_list/meta/main.yml similarity index 95% rename from roles/tripleo-container-image-list/meta/main.yml rename to roles/tripleo_container_image_list/meta/main.yml index 80e3576..16e099c 100644 --- a/roles/tripleo-container-image-list/meta/main.yml +++ b/roles/tripleo_container_image_list/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-container-image-list + description: TripleO Operator Role -- tripleo_container_image_list company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-container-image-list/tasks/main.yml b/roles/tripleo_container_image_list/tasks/main.yml similarity index 95% rename from roles/tripleo-container-image-list/tasks/main.yml rename to roles/tripleo_container_image_list/tasks/main.yml index 1658cf5..988633d 100644 --- a/roles/tripleo-container-image-list/tasks/main.yml +++ b/roles/tripleo_container_image_list/tasks/main.yml @@ -1,5 +1,5 @@ --- -# tasks file for tripleo-container-image-list +# tasks file for tripleo_container_image_list - name: Setup container image list facts set_fact: _list_cmd: >- diff --git a/roles/tripleo-container-image-list/tests/inventory b/roles/tripleo_container_image_list/tests/inventory similarity index 100% rename from roles/tripleo-container-image-list/tests/inventory rename to roles/tripleo_container_image_list/tests/inventory diff --git a/roles/tripleo-container-image-list/tests/test.yml b/roles/tripleo_container_image_list/tests/test.yml similarity index 59% rename from roles/tripleo-container-image-list/tests/test.yml rename to roles/tripleo_container_image_list/tests/test.yml index 11043bb..e566b5c 100644 --- a/roles/tripleo-container-image-list/tests/test.yml +++ b/roles/tripleo_container_image_list/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - tripleo-container-image-list + - tripleo_container_image_list diff --git a/roles/tripleo-container-image-prepare-default/README.md b/roles/tripleo_container_image_prepare_default/README.md similarity index 93% rename from roles/tripleo-container-image-prepare-default/README.md rename to roles/tripleo_container_image_prepare_default/README.md index 7bb73f3..df820fb 100644 --- a/roles/tripleo-container-image-prepare-default/README.md +++ b/roles/tripleo_container_image_prepare_default/README.md @@ -1,4 +1,4 @@ -tripleo-container-image-prepare-default +tripleo_container_image_prepare_default ============================ A role to perform the container image push against a registry. @@ -36,7 +36,7 @@ Example container prepare default execution playbook tasks: - name: Generate default ContainerImagePrepare import_role: - name: tripleo-container-image-prepare-default + name: tripleo_container_image_prepare_default vars: tripleo_container_image_prepare_output_env_file: /home/stack/container-image-prepare.yaml diff --git a/roles/tripleo-container-image-prepare-default/defaults/main.yml b/roles/tripleo_container_image_prepare_default/defaults/main.yml similarity index 100% rename from roles/tripleo-container-image-prepare-default/defaults/main.yml rename to roles/tripleo_container_image_prepare_default/defaults/main.yml diff --git a/roles/tripleo-container-image-prepare-default/meta/main.yml b/roles/tripleo_container_image_prepare_default/meta/main.yml similarity index 93% rename from roles/tripleo-container-image-prepare-default/meta/main.yml rename to roles/tripleo_container_image_prepare_default/meta/main.yml index 7f238c9..cbb2ad2 100644 --- a/roles/tripleo-container-image-prepare-default/meta/main.yml +++ b/roles/tripleo_container_image_prepare_default/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-container-image-prepare-default + description: TripleO Operator Role -- tripleo_container_image_prepare_default company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-container-image-prepare-default/tasks/main.yml b/roles/tripleo_container_image_prepare_default/tasks/main.yml similarity index 93% rename from roles/tripleo-container-image-prepare-default/tasks/main.yml rename to roles/tripleo_container_image_prepare_default/tasks/main.yml index f738582..7b8c3b2 100644 --- a/roles/tripleo-container-image-prepare-default/tasks/main.yml +++ b/roles/tripleo_container_image_prepare_default/tasks/main.yml @@ -1,5 +1,5 @@ --- -# tasks file for tripleo-container-image-prepare-default +# tasks file for tripleo_container_image_prepare_default - name: Setup container image prepare default facts set_fact: _prepare_cmd: >- diff --git a/roles/tripleo-container-image-prepare-default/tests/inventory b/roles/tripleo_container_image_prepare_default/tests/inventory similarity index 100% rename from roles/tripleo-container-image-prepare-default/tests/inventory rename to roles/tripleo_container_image_prepare_default/tests/inventory diff --git a/roles/tripleo-container-image-prepare-default/tests/test.yml b/roles/tripleo_container_image_prepare_default/tests/test.yml similarity index 77% rename from roles/tripleo-container-image-prepare-default/tests/test.yml rename to roles/tripleo_container_image_prepare_default/tests/test.yml index 568c2e1..a73a056 100644 --- a/roles/tripleo-container-image-prepare-default/tests/test.yml +++ b/roles/tripleo_container_image_prepare_default/tests/test.yml @@ -1,6 +1,6 @@ --- - hosts: localhost roles: - - tripleo-container-image-prepare-default + - tripleo_container_image_prepare_default vars: tripleo_container_image_prepare_default_output_env_file: "{{ ansible_env.HOME }}/container-image-prepare.yaml }}" diff --git a/roles/tripleo-container-image-push/README.md b/roles/tripleo_container_image_push/README.md similarity index 96% rename from roles/tripleo-container-image-push/README.md rename to roles/tripleo_container_image_push/README.md index 3e7d218..864e552 100644 --- a/roles/tripleo-container-image-push/README.md +++ b/roles/tripleo_container_image_push/README.md @@ -1,4 +1,4 @@ -tripleo-container-image-push +tripleo_container_image_push ============================ A role to perform the container image push against a registry. @@ -45,7 +45,7 @@ Example container push execution playbook tasks: - name: Push a container import_role: - name: tripleo-container-image-push + name: tripleo_container_image_push vars: tripleo_container_image_push_image: docker.io/library/centos:7 - name: Print output diff --git a/roles/tripleo-container-image-push/defaults/main.yml b/roles/tripleo_container_image_push/defaults/main.yml similarity index 90% rename from roles/tripleo-container-image-push/defaults/main.yml rename to roles/tripleo_container_image_push/defaults/main.yml index eb87ccf..8b73eb3 100644 --- a/roles/tripleo-container-image-push/defaults/main.yml +++ b/roles/tripleo_container_image_push/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-container-image-push +# defaults file for tripleo_container_image_push tripleo_container_image_push_append_tag: tripleo_container_image_push_become: true tripleo_container_image_push_cleanup: false diff --git a/roles/tripleo-container-image-push/meta/main.yml b/roles/tripleo_container_image_push/meta/main.yml similarity index 95% rename from roles/tripleo-container-image-push/meta/main.yml rename to roles/tripleo_container_image_push/meta/main.yml index e01b969..319a856 100644 --- a/roles/tripleo-container-image-push/meta/main.yml +++ b/roles/tripleo_container_image_push/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-container-image-push + description: TripleO Operator Role -- tripleo_container_image_push company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-container-image-push/tasks/main.yml b/roles/tripleo_container_image_push/tasks/main.yml similarity index 96% rename from roles/tripleo-container-image-push/tasks/main.yml rename to roles/tripleo_container_image_push/tasks/main.yml index 9b738ef..f8e6e53 100644 --- a/roles/tripleo-container-image-push/tasks/main.yml +++ b/roles/tripleo_container_image_push/tasks/main.yml @@ -1,5 +1,5 @@ --- -# tasks file for tripleo-container-image-push +# tasks file for tripleo_container_image_push - name: Setup container image push facts set_fact: _push_cmd: >- diff --git a/roles/tripleo-container-image-push/tests/inventory b/roles/tripleo_container_image_push/tests/inventory similarity index 100% rename from roles/tripleo-container-image-push/tests/inventory rename to roles/tripleo_container_image_push/tests/inventory diff --git a/roles/tripleo-container-image-push/tests/test.yml b/roles/tripleo_container_image_push/tests/test.yml similarity index 78% rename from roles/tripleo-container-image-push/tests/test.yml rename to roles/tripleo_container_image_push/tests/test.yml index 17cd48e..62d5a01 100644 --- a/roles/tripleo-container-image-push/tests/test.yml +++ b/roles/tripleo_container_image_push/tests/test.yml @@ -2,6 +2,6 @@ - hosts: localhost remote_user: root roles: - - tripleo-container-image-push + - tripleo_container_image_push vars: tripleo_container_image_push_image: docker.io/library/centos:7 diff --git a/roles/tripleo-container-image-show/README.md b/roles/tripleo_container_image_show/README.md similarity index 95% rename from roles/tripleo-container-image-show/README.md rename to roles/tripleo_container_image_show/README.md index 07a23b3..220f49c 100644 --- a/roles/tripleo-container-image-show/README.md +++ b/roles/tripleo_container_image_show/README.md @@ -1,4 +1,4 @@ -tripleo-container-image-show +tripleo_container_image_show ============================ A role to perform the container image show against a registry. @@ -38,7 +38,7 @@ Example container show execution playbook tasks: - name: List containers import_role: - name: tripleo-container-image-show + name: tripleo_container_image_show vars: tripleo_container_image_show_image: docker.io/library/centos:7 - name: Print containers diff --git a/roles/tripleo-container-image-show/defaults/main.yml b/roles/tripleo_container_image_show/defaults/main.yml similarity index 77% rename from roles/tripleo-container-image-show/defaults/main.yml rename to roles/tripleo_container_image_show/defaults/main.yml index b3d3d40..2c99163 100644 --- a/roles/tripleo-container-image-show/defaults/main.yml +++ b/roles/tripleo_container_image_show/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-container-image-show +# defaults file for tripleo_container_image_show tripleo_container_image_show_debug: false tripleo_container_image_show_format: json tripleo_container_image_show_password: diff --git a/roles/tripleo-container-image-show/meta/main.yml b/roles/tripleo_container_image_show/meta/main.yml similarity index 95% rename from roles/tripleo-container-image-show/meta/main.yml rename to roles/tripleo_container_image_show/meta/main.yml index d1c8bec..19cfdf6 100644 --- a/roles/tripleo-container-image-show/meta/main.yml +++ b/roles/tripleo_container_image_show/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-container-image-show + description: TripleO Operator Role -- tripleo_container_image_show company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-container-image-show/tasks/main.yml b/roles/tripleo_container_image_show/tasks/main.yml similarity index 95% rename from roles/tripleo-container-image-show/tasks/main.yml rename to roles/tripleo_container_image_show/tasks/main.yml index e7ad993..9eb1a83 100644 --- a/roles/tripleo-container-image-show/tasks/main.yml +++ b/roles/tripleo_container_image_show/tasks/main.yml @@ -1,5 +1,5 @@ --- -# tasks file for tripleo-container-image-show +# tasks file for tripleo_container_image_show - name: Setup container image show facts set_fact: _show_cmd: >- diff --git a/roles/tripleo-container-image-show/tests/inventory b/roles/tripleo_container_image_show/tests/inventory similarity index 100% rename from roles/tripleo-container-image-show/tests/inventory rename to roles/tripleo_container_image_show/tests/inventory diff --git a/roles/tripleo-container-image-show/tests/test.yml b/roles/tripleo_container_image_show/tests/test.yml similarity index 78% rename from roles/tripleo-container-image-show/tests/test.yml rename to roles/tripleo_container_image_show/tests/test.yml index 34724f0..dc279cb 100644 --- a/roles/tripleo-container-image-show/tests/test.yml +++ b/roles/tripleo_container_image_show/tests/test.yml @@ -2,6 +2,6 @@ - hosts: localhost remote_user: root roles: - - tripleo-container-image-show + - tripleo_container_image_show vars: tripleo_container_image_show_image: docker.io/library/centos:7 diff --git a/roles/tripleo-repos/README.md b/roles/tripleo_repos/README.md similarity index 85% rename from roles/tripleo-repos/README.md rename to roles/tripleo_repos/README.md index e2e5b42..b27422c 100644 --- a/roles/tripleo-repos/README.md +++ b/roles/tripleo_repos/README.md @@ -1,7 +1,7 @@ -tripleo-repos +tripleo_repos ============= -Role to install tripleo-repos and use it to manage tripleo yum repos. +Role to install tripleo_repos and use it to manage tripleo yum repos. Requirements ------------ @@ -12,7 +12,7 @@ Role Variables -------------- * `tripleo_repos_branch`: (String) Repo branch to configure (master|train|stein|etc) -* `tripleo_repos_extra_args`: (List) List of extra arguments to pass to tripleo-repos +* `tripleo_repos_extra_args`: (List) List of extra arguments to pass to tripleo_repos * `tripleo_repos_extra_repos`: (List) List of extra repos to configure (e.g. ceph) * `tripleo_repos_repo_base`: (String) Url base to RDO (default: https://trunk.rdoproject.org) * `tripleo_repos_version`: (String) Version to configure (current-tripleo-dev|current-tripleo|current) @@ -29,9 +29,9 @@ Including an example of how to use your role (for instance, with variables passe - hosts: servers roles: - - name: Setup tripleo-repos + - name: Setup tripleo_repos include_role: - name: tripleo-repos + name: tripleo_repos vars: tripleo_repos_extra_repos: - ceph diff --git a/roles/tripleo-repos/defaults/main.yml b/roles/tripleo_repos/defaults/main.yml similarity index 84% rename from roles/tripleo-repos/defaults/main.yml rename to roles/tripleo_repos/defaults/main.yml index 54f2784..e7f2ae5 100644 --- a/roles/tripleo-repos/defaults/main.yml +++ b/roles/tripleo_repos/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-repos +# defaults file for tripleo_repos tripleo_repos_branch: master tripleo_repos_extra_args: [] tripleo_repos_extra_repos: [] diff --git a/roles/tripleo_repos/handlers/main.yml b/roles/tripleo_repos/handlers/main.yml new file mode 100644 index 0000000..c534411 --- /dev/null +++ b/roles/tripleo_repos/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for tripleo_repos diff --git a/roles/tripleo-repos/meta/main.yml b/roles/tripleo_repos/meta/main.yml similarity index 95% rename from roles/tripleo-repos/meta/main.yml rename to roles/tripleo_repos/meta/main.yml index 16aca65..7063606 100644 --- a/roles/tripleo-repos/meta/main.yml +++ b/roles/tripleo_repos/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-repos + description: TripleO Operator Role -- tripleo_repos company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-repos/tasks/install.yml b/roles/tripleo_repos/tasks/install.yml similarity index 82% rename from roles/tripleo-repos/tasks/install.yml rename to roles/tripleo_repos/tasks/install.yml index b1a376a..f25bfc9 100644 --- a/roles/tripleo-repos/tasks/install.yml +++ b/roles/tripleo_repos/tasks/install.yml @@ -7,7 +7,7 @@ set_fact: _tripleo_repos_repo_url: "{{ tripleo_repos_repo_base }}/{{ _tripleo_repos_distro }}-{{ tripleo_repos_branch }}/current/" -- name: Find available tripleo-repos rpm +- name: Find available tripleo_repos rpm block: - name: Grab repo package list uri: @@ -18,13 +18,13 @@ register: _tripleo_repos_repo_data - name: Find rpm name set_fact: - _tripleo_repos_rpm: "{{ _tripleo_repos_repo_data.content | regex_search('python[0-9]-tripleo-repos-[a-z0-9-.]+\\.rpm') }}" + _tripleo_repos_rpm: "{{ _tripleo_repos_repo_data.content | regex_search('python[0-9]-tripleo_repos-[a-z0-9-.]+\\.rpm') }}" - name: Fail if rpm is missing fail: - msg: Unable to find tripleo-repos rpm + msg: Unable to find tripleo_repos rpm when: _tripleo_repos_rpm|length == 0 -- name: Install tripleo-repos +- name: Install tripleo_repos yum: name: "{{ _tripleo_repos_repo_url }}{{ _tripleo_repos_rpm }}" state: present diff --git a/roles/tripleo-repos/tasks/main.yml b/roles/tripleo_repos/tasks/main.yml similarity index 75% rename from roles/tripleo-repos/tasks/main.yml rename to roles/tripleo_repos/tasks/main.yml index d03214a..cffc430 100644 --- a/roles/tripleo-repos/tasks/main.yml +++ b/roles/tripleo_repos/tasks/main.yml @@ -1,5 +1,5 @@ --- -# tasks file for tripleo-repos +# tasks file for tripleo_repos # TODO(mwhahaha): uncomment this once we have a version of ansible with # https://github.com/ansible/ansible/pull/65776 @@ -11,14 +11,14 @@ - name: Gather the rpm package facts package_facts: -- name: Install tripleo-repos +- name: Install tripleo_repos include_tasks: install.yml - when: (ansible_facts.distribution_major_version|int <= 7 and not 'python2-tripleo-repos' in ansible_facts.packages) or - (ansible_facts.distribution_major_version|int <= 8 and not 'python3-tripleo-repos' in ansible_facts.packages) + when: (ansible_facts.distribution_major_version|int <= 7 and not 'python2-tripleo_repos' in ansible_facts.packages) or + (ansible_facts.distribution_major_version|int <= 8 and not 'python3-tripleo_repos' in ansible_facts.packages) -- name: Run tripleo-repos +- name: Run tripleo_repos command: >- - tripleo-repos + tripleo_repos -b {{ tripleo_repos_branch }} {{ tripleo_repos_extra_args | join(' ') }} {{ tripleo_repos_version }} diff --git a/roles/tripleo-repos/tests/inventory b/roles/tripleo_repos/tests/inventory similarity index 100% rename from roles/tripleo-repos/tests/inventory rename to roles/tripleo_repos/tests/inventory diff --git a/roles/tripleo-repos/tests/test.yml b/roles/tripleo_repos/tests/test.yml similarity index 72% rename from roles/tripleo-repos/tests/test.yml rename to roles/tripleo_repos/tests/test.yml index 54d54bd..b3c7979 100644 --- a/roles/tripleo-repos/tests/test.yml +++ b/roles/tripleo_repos/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - tripleo-repos + - tripleo_repos diff --git a/roles/tripleo_repos/vars/main.yml b/roles/tripleo_repos/vars/main.yml new file mode 100644 index 0000000..5778caa --- /dev/null +++ b/roles/tripleo_repos/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for tripleo_repos diff --git a/roles/tripleo-undercloud-backup/README.md b/roles/tripleo_undercloud_backup/README.md similarity index 95% rename from roles/tripleo-undercloud-backup/README.md rename to roles/tripleo_undercloud_backup/README.md index 685b2b1..c97b62d 100644 --- a/roles/tripleo-undercloud-backup/README.md +++ b/roles/tripleo_undercloud_backup/README.md @@ -1,4 +1,4 @@ -tripleo-undercloud-backup +tripleo_undercloud_backup ========================= A role to run backup of a TripleO undercloud. @@ -41,7 +41,7 @@ Example backup execution playbook tasks: - name: Backup undercloud import_role: - name: tripleo-undercloud-backup + name: tripleo_undercloud_backup vars: tripleo_undercloud_backup_debug: true diff --git a/roles/tripleo-undercloud-backup/defaults/main.yml b/roles/tripleo_undercloud_backup/defaults/main.yml similarity index 89% rename from roles/tripleo-undercloud-backup/defaults/main.yml rename to roles/tripleo_undercloud_backup/defaults/main.yml index 2004eaf..625acdc 100644 --- a/roles/tripleo-undercloud-backup/defaults/main.yml +++ b/roles/tripleo_undercloud_backup/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-undercloud-backup +# defaults file for tripleo_undercloud_backup tripleo_undercloud_backup_add_path: [] tripleo_undercloud_backup_debug: false tripleo_undercloud_backup_exclude_path: [] diff --git a/roles/tripleo-undercloud-backup/meta/main.yml b/roles/tripleo_undercloud_backup/meta/main.yml similarity index 95% rename from roles/tripleo-undercloud-backup/meta/main.yml rename to roles/tripleo_undercloud_backup/meta/main.yml index 9890039..fa1b175 100644 --- a/roles/tripleo-undercloud-backup/meta/main.yml +++ b/roles/tripleo_undercloud_backup/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-undercloud-backup + description: TripleO Operator Role -- tripleo_undercloud_backup company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-undercloud-backup/tasks/main.yml b/roles/tripleo_undercloud_backup/tasks/main.yml similarity index 100% rename from roles/tripleo-undercloud-backup/tasks/main.yml rename to roles/tripleo_undercloud_backup/tasks/main.yml diff --git a/roles/tripleo-undercloud-backup/tests/inventory b/roles/tripleo_undercloud_backup/tests/inventory similarity index 100% rename from roles/tripleo-undercloud-backup/tests/inventory rename to roles/tripleo_undercloud_backup/tests/inventory diff --git a/roles/tripleo-undercloud-backup/tests/test.yml b/roles/tripleo_undercloud_backup/tests/test.yml similarity index 61% rename from roles/tripleo-undercloud-backup/tests/test.yml rename to roles/tripleo_undercloud_backup/tests/test.yml index b73e1de..e540549 100644 --- a/roles/tripleo-undercloud-backup/tests/test.yml +++ b/roles/tripleo_undercloud_backup/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - tripleo-undercloud-backup + - tripleo_undercloud_backup diff --git a/roles/tripleo-undercloud-install/README.md b/roles/tripleo_undercloud_install/README.md similarity index 96% rename from roles/tripleo-undercloud-install/README.md rename to roles/tripleo_undercloud_install/README.md index bafe544..c7030ca 100644 --- a/roles/tripleo-undercloud-install/README.md +++ b/roles/tripleo_undercloud_install/README.md @@ -1,4 +1,4 @@ -tripleo-undercloud-install +tripleo_undercloud_install ========================== A role to run the install of a TripleO undercloud. @@ -44,7 +44,7 @@ Example install execution playbook tasks: - name: Install undercloud import_role: - name: tripleo-undercloud-install + name: tripleo_undercloud_install vars: tripleo_undercloud_install_debug: true diff --git a/roles/tripleo-undercloud-install/defaults/main.yml b/roles/tripleo_undercloud_install/defaults/main.yml similarity index 92% rename from roles/tripleo-undercloud-install/defaults/main.yml rename to roles/tripleo_undercloud_install/defaults/main.yml index ba45695..0e317b1 100644 --- a/roles/tripleo-undercloud-install/defaults/main.yml +++ b/roles/tripleo_undercloud_install/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-undercloud-install +# defaults file for tripleo_undercloud_install tripleo_undercloud_install_debug: false tripleo_undercloud_install_dry_run: false tripleo_undercloud_install_force_stack_update: false diff --git a/roles/tripleo-undercloud-install/meta/main.yml b/roles/tripleo_undercloud_install/meta/main.yml similarity index 95% rename from roles/tripleo-undercloud-install/meta/main.yml rename to roles/tripleo_undercloud_install/meta/main.yml index 2427bd1..d56efc7 100644 --- a/roles/tripleo-undercloud-install/meta/main.yml +++ b/roles/tripleo_undercloud_install/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-undercloud-install + description: TripleO Operator Role -- tripleo_undercloud_install company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-undercloud-install/tasks/main.yml b/roles/tripleo_undercloud_install/tasks/main.yml similarity index 100% rename from roles/tripleo-undercloud-install/tasks/main.yml rename to roles/tripleo_undercloud_install/tasks/main.yml diff --git a/roles/tripleo-undercloud-install/tests/inventory b/roles/tripleo_undercloud_install/tests/inventory similarity index 100% rename from roles/tripleo-undercloud-install/tests/inventory rename to roles/tripleo_undercloud_install/tests/inventory diff --git a/roles/tripleo-undercloud-install/tests/test.yml b/roles/tripleo_undercloud_install/tests/test.yml similarity index 61% rename from roles/tripleo-undercloud-install/tests/test.yml rename to roles/tripleo_undercloud_install/tests/test.yml index 2cf25a1..4630bdc 100644 --- a/roles/tripleo-undercloud-install/tests/test.yml +++ b/roles/tripleo_undercloud_install/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - tripleo-undercloud-install + - tripleo_undercloud_install diff --git a/roles/tripleo-undercloud-minion-install/README.md b/roles/tripleo_undercloud_minion_install/README.md similarity index 95% rename from roles/tripleo-undercloud-minion-install/README.md rename to roles/tripleo_undercloud_minion_install/README.md index c7c0d62..4ddb3b5 100644 --- a/roles/tripleo-undercloud-minion-install/README.md +++ b/roles/tripleo_undercloud_minion_install/README.md @@ -1,4 +1,4 @@ -tripleo-undercloud-minion-install +tripleo_undercloud_minion_install ========================== A role to run the install a TripleO undercloud minion. @@ -43,7 +43,7 @@ Example install execution playbook tasks: - name: Install undercloud minion import_role: - name: tripleo-undercloud-minion-install + name: tripleo_undercloud_minion_install vars: tripleo_undercloud_minion_install_debug: true diff --git a/roles/tripleo-undercloud-minion-install/defaults/main.yml b/roles/tripleo_undercloud_minion_install/defaults/main.yml similarity index 91% rename from roles/tripleo-undercloud-minion-install/defaults/main.yml rename to roles/tripleo_undercloud_minion_install/defaults/main.yml index 54717e6..90ea753 100644 --- a/roles/tripleo-undercloud-minion-install/defaults/main.yml +++ b/roles/tripleo_undercloud_minion_install/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-undercloud-minion-install +# defaults file for tripleo_undercloud_minion_install tripleo_undercloud_minion_install_debug: false tripleo_undercloud_minion_install_home_dir: "{{ ansible_env.HOME }}" tripleo_undercloud_minion_install_dry_run: false diff --git a/roles/tripleo_undercloud_minion_install/meta/main.yml b/roles/tripleo_undercloud_minion_install/meta/main.yml new file mode 100644 index 0000000..b7566a0 --- /dev/null +++ b/roles/tripleo_undercloud_minion_install/meta/main.yml @@ -0,0 +1,42 @@ +--- +# Copyright 2019 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +galaxy_info: + author: OpenStack + description: TripleO Operator Role -- tripleo_undercloud_minion_install + company: Red Hat + license: Apache-2.0 + min_ansible_version: 2.8 + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + platforms: + - name: CentOS + versions: + - 7 + - 8 + + galaxy_tags: + - tripleo + + +# List your role dependencies here, one per line. Be sure to remove the '[]' above, +# if you add dependencies to this list. +dependencies: [] diff --git a/roles/tripleo-undercloud-minion-install/tasks/main.yml b/roles/tripleo_undercloud_minion_install/tasks/main.yml similarity index 100% rename from roles/tripleo-undercloud-minion-install/tasks/main.yml rename to roles/tripleo_undercloud_minion_install/tasks/main.yml diff --git a/roles/tripleo-undercloud-minion-install/tests/inventory b/roles/tripleo_undercloud_minion_install/tests/inventory similarity index 100% rename from roles/tripleo-undercloud-minion-install/tests/inventory rename to roles/tripleo_undercloud_minion_install/tests/inventory diff --git a/roles/tripleo_undercloud_minion_install/tests/test.yml b/roles/tripleo_undercloud_minion_install/tests/test.yml new file mode 100644 index 0000000..2ae272d --- /dev/null +++ b/roles/tripleo_undercloud_minion_install/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - tripleo_undercloud_minion_install diff --git a/roles/tripleo-undercloud-minion-upgrade/README.md b/roles/tripleo_undercloud_minion_upgrade/README.md similarity index 95% rename from roles/tripleo-undercloud-minion-upgrade/README.md rename to roles/tripleo_undercloud_minion_upgrade/README.md index 3da9aeb..dc30f74 100644 --- a/roles/tripleo-undercloud-minion-upgrade/README.md +++ b/roles/tripleo_undercloud_minion_upgrade/README.md @@ -1,4 +1,4 @@ -tripleo-undercloud-minion-upgrade +tripleo_undercloud_minion_upgrade ================================= A role to run the upgrade of a TripleO undercloud minion. @@ -44,7 +44,7 @@ Example upgrade execution playbook tasks: - name: Upgrade undercloud minion import_role: - name: tripleo-undercloud-minion-upgrade + name: tripleo_undercloud_minion_upgrade vars: tripleo_undercloud_minion_upgrade_debug: true diff --git a/roles/tripleo-undercloud-minion-upgrade/defaults/main.yml b/roles/tripleo_undercloud_minion_upgrade/defaults/main.yml similarity index 91% rename from roles/tripleo-undercloud-minion-upgrade/defaults/main.yml rename to roles/tripleo_undercloud_minion_upgrade/defaults/main.yml index 6e873cf..cc90ca9 100644 --- a/roles/tripleo-undercloud-minion-upgrade/defaults/main.yml +++ b/roles/tripleo_undercloud_minion_upgrade/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tripleo-undercloud-minion-upgrade +# defaults file for tripleo_undercloud_minion_upgrade tripleo_undercloud_minion_upgrade_debug: false tripleo_undercloud_minion_upgrade_dry_run: false tripleo_undercloud_minion_upgrade_force_stack_update: false diff --git a/roles/tripleo-undercloud-minion-install/meta/main.yml b/roles/tripleo_undercloud_minion_upgrade/meta/main.yml similarity index 100% rename from roles/tripleo-undercloud-minion-install/meta/main.yml rename to roles/tripleo_undercloud_minion_upgrade/meta/main.yml diff --git a/roles/tripleo-undercloud-minion-upgrade/tasks/main.yml b/roles/tripleo_undercloud_minion_upgrade/tasks/main.yml similarity index 100% rename from roles/tripleo-undercloud-minion-upgrade/tasks/main.yml rename to roles/tripleo_undercloud_minion_upgrade/tasks/main.yml diff --git a/roles/tripleo-undercloud-minion-upgrade/tests/inventory b/roles/tripleo_undercloud_minion_upgrade/tests/inventory similarity index 100% rename from roles/tripleo-undercloud-minion-upgrade/tests/inventory rename to roles/tripleo_undercloud_minion_upgrade/tests/inventory diff --git a/roles/tripleo_undercloud_minion_upgrade/tests/test.yml b/roles/tripleo_undercloud_minion_upgrade/tests/test.yml new file mode 100644 index 0000000..e4b1162 --- /dev/null +++ b/roles/tripleo_undercloud_minion_upgrade/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - tripleo_undercloud_minion_upgrade diff --git a/roles/tripleo-undercloud-upgrade/README.md b/roles/tripleo_undercloud_upgrade/README.md similarity index 96% rename from roles/tripleo-undercloud-upgrade/README.md rename to roles/tripleo_undercloud_upgrade/README.md index 8d9f9d0..6448031 100644 --- a/roles/tripleo-undercloud-upgrade/README.md +++ b/roles/tripleo_undercloud_upgrade/README.md @@ -1,4 +1,4 @@ -tripleo-undercloud-upgrade +tripleo_undercloud_upgrade ========================== A role to run the upgrade of a TripleO undercloud. @@ -44,7 +44,7 @@ Example upgrade execution playbook tasks: - name: Upgrade undercloud import_role: - name: tripleo-undercloud-upgrade + name: tripleo_undercloud_upgrade vars: tripleo_undercloud_upgrade_debug: true diff --git a/roles/tripleo-undercloud-upgrade/defaults/main.yml b/roles/tripleo_undercloud_upgrade/defaults/main.yml similarity index 100% rename from roles/tripleo-undercloud-upgrade/defaults/main.yml rename to roles/tripleo_undercloud_upgrade/defaults/main.yml diff --git a/roles/tripleo-undercloud-upgrade/meta/main.yml b/roles/tripleo_undercloud_upgrade/meta/main.yml similarity index 95% rename from roles/tripleo-undercloud-upgrade/meta/main.yml rename to roles/tripleo_undercloud_upgrade/meta/main.yml index 8dd5fa3..f2b99d7 100644 --- a/roles/tripleo-undercloud-upgrade/meta/main.yml +++ b/roles/tripleo_undercloud_upgrade/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO Operator Role -- tripleo-undercloud-upgrade + description: TripleO Operator Role -- tripleo_undercloud_upgrade company: Red Hat license: Apache-2.0 min_ansible_version: 2.8 diff --git a/roles/tripleo-undercloud-upgrade/tasks/main.yml b/roles/tripleo_undercloud_upgrade/tasks/main.yml similarity index 100% rename from roles/tripleo-undercloud-upgrade/tasks/main.yml rename to roles/tripleo_undercloud_upgrade/tasks/main.yml diff --git a/roles/tripleo-undercloud-upgrade/tests/inventory b/roles/tripleo_undercloud_upgrade/tests/inventory similarity index 100% rename from roles/tripleo-undercloud-upgrade/tests/inventory rename to roles/tripleo_undercloud_upgrade/tests/inventory diff --git a/roles/tripleo-undercloud-upgrade/tests/test.yml b/roles/tripleo_undercloud_upgrade/tests/test.yml similarity index 61% rename from roles/tripleo-undercloud-upgrade/tests/test.yml rename to roles/tripleo_undercloud_upgrade/tests/test.yml index 67624cb..be9c2c6 100644 --- a/roles/tripleo-undercloud-upgrade/tests/test.yml +++ b/roles/tripleo_undercloud_upgrade/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - tripleo-undercloud-upgrade + - tripleo_undercloud_upgrade diff --git a/setup.cfg b/setup.cfg index f9c14ef..fc4e9bc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,6 +25,19 @@ data_files = share/ansible/collections/ansible_collections/tripleo/operator/ = README.md share/ansible/collections/ansible_collections/tripleo/operator/roles/ = roles/* share/ansible/collections/ansible_collections/tripleo/operator/plugins/ = plugins/* + # TODO(mwhahaha): remove once rename is complete + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-config-generate-ansible/ = roles/tripleo-config-generate-ansible/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-container-image-delete/ = roles/tripleo-container-image-delete/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-container-image-list/ = roles/tripleo-container-image-list/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-container-image-prepare-default/ = roles/tripleo-container-image-prepare-default/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-container-image-push/ = roles/tripleo-container-image-push/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-container-image-show/ = roles/tripleo-container-image-show/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-repos/ = roles/tripleo-repos/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-undercloud-backup/ = roles/tripleo-undercloud-backup/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-undercloud-install/ = roles/tripleo-undercloud-install/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-undercloud-minion-install/ = roles/tripleo-undercloud-minion-install/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-undercloud-minion-upgrade/ = roles/tripleo-undercloud-minion-upgrade/* + share/ansible/collections/ansible_collections/tripleo/operator/roles/tripleo-undercloud-upgrade/ = roles/tripleo-undercloud-upgrade/* [wheel] universal = 1 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 15acd16..70ead16 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -11,7 +11,7 @@ - openstack-tox-py37 - openstack-tox-linters files: &containers_multinode_files - - ^roles/tripleo-undercloud-install/.*$ + - ^roles/tripleo_undercloud_install/.*$ gate: jobs: - openstack-tox-linters