Browse Source

Rename all roles that have a hyphen

All roles that have a hyphen in them need to be renamed to use an
underscore. This change creates a symlink to all roles using their
original name which will ensure we maintain compatibility with
the rest of the TripleO stack. This is being done because roles with
hyphens are no longer valid within collections.

A temp PBR update has been made to accomodate all of the symlinks to
the legacy role names.

[0] https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#roles-directory

Change-Id: Id00a3670351990e5489a297c4c7200f8c05af096
Signed-off-by: Kevin Carter <kecarter@redhat.com>
changes/27/703427/4
Kevin Carter 2 years ago
parent
commit
67ce344e30
  1. 48
      setup.cfg
  2. 1
      tripleo_ansible/roles/backup-and-restore
  3. 0
      tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml
  4. 0
      tripleo_ansible/roles/backup_and_restore/defaults/main.yml
  5. 0
      tripleo_ansible/roles/backup_and_restore/meta/main.yml
  6. 0
      tripleo_ansible/roles/backup_and_restore/molecule/default/Dockerfile
  7. 0
      tripleo_ansible/roles/backup_and_restore/molecule/default/molecule.yml
  8. 0
      tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml
  9. 0
      tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml
  10. 0
      tripleo_ansible/roles/backup_and_restore/setup_nfs/tasks/main.yml
  11. 0
      tripleo_ansible/roles/backup_and_restore/setup_rear/tasks/main.yml
  12. 0
      tripleo_ansible/roles/backup_and_restore/tasks/main.yml
  13. 0
      tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml
  14. 0
      tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml
  15. 0
      tripleo_ansible/roles/backup_and_restore/templates/exports.j2
  16. 0
      tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2
  17. 0
      tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2
  18. 0
      tripleo_ansible/roles/backup_and_restore/vars/redhat.yml
  19. 1
      tripleo_ansible/roles/login-defs
  20. 0
      tripleo_ansible/roles/login_defs/defaults/main.yml
  21. 0
      tripleo_ansible/roles/login_defs/meta/main.yml
  22. 0
      tripleo_ansible/roles/login_defs/molecule/default/Dockerfile
  23. 0
      tripleo_ansible/roles/login_defs/molecule/default/molecule.yml
  24. 0
      tripleo_ansible/roles/login_defs/molecule/default/playbook.yml
  25. 0
      tripleo_ansible/roles/login_defs/molecule/default/prepare.yml
  26. 0
      tripleo_ansible/roles/login_defs/molecule/default/verify.yml
  27. 0
      tripleo_ansible/roles/login_defs/tasks/main.yml
  28. 1
      tripleo_ansible/roles/octavia-controller-config
  29. 1
      tripleo_ansible/roles/octavia-controller-post-config
  30. 1
      tripleo_ansible/roles/octavia-overcloud-config
  31. 1
      tripleo_ansible/roles/octavia-undercloud
  32. 0
      tripleo_ansible/roles/octavia_controller_config/handlers/main.yml
  33. 0
      tripleo_ansible/roles/octavia_controller_config/meta/main.yml
  34. 0
      tripleo_ansible/roles/octavia_controller_config/tasks/certificate.yml
  35. 0
      tripleo_ansible/roles/octavia_controller_config/tasks/main.yml
  36. 0
      tripleo_ansible/roles/octavia_controller_config/tasks/netinterface.yml
  37. 0
      tripleo_ansible/roles/octavia_controller_config/tasks/netport.yml
  38. 0
      tripleo_ansible/roles/octavia_controller_config/tasks/octavia.yml
  39. 0
      tripleo_ansible/roles/octavia_controller_config/templates/ifcfg-br-int.j2
  40. 0
      tripleo_ansible/roles/octavia_controller_config/templates/ifcfg.j2
  41. 0
      tripleo_ansible/roles/octavia_controller_post_config/defaults/main.yml
  42. 0
      tripleo_ansible/roles/octavia_controller_post_config/meta/main.yml
  43. 0
      tripleo_ansible/roles/octavia_controller_post_config/tasks/main.yml
  44. 0
      tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml
  45. 0
      tripleo_ansible/roles/octavia_overcloud_config/tasks/certs_gen.yml
  46. 0
      tripleo_ansible/roles/octavia_overcloud_config/tasks/main.yml
  47. 0
      tripleo_ansible/roles/octavia_overcloud_config/tasks/network.yml
  48. 0
      tripleo_ansible/roles/octavia_overcloud_config/tasks/quotas.yml
  49. 0
      tripleo_ansible/roles/octavia_undercloud/meta/main.yml
  50. 0
      tripleo_ansible/roles/octavia_undercloud/tasks/image_mgmt.yml
  51. 0
      tripleo_ansible/roles/octavia_undercloud/tasks/main.yml
  52. 1
      tripleo_ansible/roles/tripleo-bootstrap
  53. 1
      tripleo_ansible/roles/tripleo-cellv2
  54. 1
      tripleo_ansible/roles/tripleo-ceph-common
  55. 1
      tripleo_ansible/roles/tripleo-ceph-fetch-dir
  56. 1
      tripleo_ansible/roles/tripleo-ceph-run-ansible
  57. 1
      tripleo_ansible/roles/tripleo-ceph-uuid
  58. 1
      tripleo_ansible/roles/tripleo-ceph-work-dir
  59. 1
      tripleo_ansible/roles/tripleo-clients-install
  60. 1
      tripleo_ansible/roles/tripleo-config
  61. 1
      tripleo_ansible/roles/tripleo-container-image-prepare
  62. 26
      tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/DockerfileRegistry
  63. 90
      tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml
  64. 91
      tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/playbook.yml
  65. 43
      tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/prepare.yml
  66. 1
      tripleo_ansible/roles/tripleo-container-manage
  67. 1
      tripleo_ansible/roles/tripleo-container-rm
  68. 1
      tripleo_ansible/roles/tripleo-container-stop
  69. 1
      tripleo_ansible/roles/tripleo-container-tag
  70. 1
      tripleo_ansible/roles/tripleo-create-admin
  71. 2
      tripleo_ansible/roles/tripleo-docker-rm
  72. 1
      tripleo_ansible/roles/tripleo-firewall
  73. 1
      tripleo_ansible/roles/tripleo-hieradata
  74. 1
      tripleo_ansible/roles/tripleo-hosts-entries
  75. 1
      tripleo_ansible/roles/tripleo-image-serve
  76. 1
      tripleo_ansible/roles/tripleo-kernel
  77. 1
      tripleo_ansible/roles/tripleo-keystone-resources
  78. 1
      tripleo_ansible/roles/tripleo-module-load
  79. 1
      tripleo_ansible/roles/tripleo-nova-image-cache
  80. 1
      tripleo_ansible/roles/tripleo-ovs-dpdk
  81. 1
      tripleo_ansible/roles/tripleo-packages
  82. 1
      tripleo_ansible/roles/tripleo-persist
  83. 1
      tripleo_ansible/roles/tripleo-podman
  84. 1
      tripleo_ansible/roles/tripleo-ptp
  85. 1
      tripleo_ansible/roles/tripleo-puppet-cache
  86. 1
      tripleo_ansible/roles/tripleo-securetty
  87. 1
      tripleo_ansible/roles/tripleo-ssh-known-hosts
  88. 1
      tripleo_ansible/roles/tripleo-sshd
  89. 1
      tripleo_ansible/roles/tripleo-systemd-wrapper
  90. 1
      tripleo_ansible/roles/tripleo-timezone
  91. 1
      tripleo_ansible/roles/tripleo-transfer
  92. 1
      tripleo_ansible/roles/tripleo-upgrade-hiera
  93. 1
      tripleo_ansible/roles/tripleo-validations-package
  94. 37
      tripleo_ansible/roles/tripleo-validations-package/molecule/default/Dockerfile
  95. 0
      tripleo_ansible/roles/tripleo_bootstrap/defaults/main.yml
  96. 0
      tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml
  97. 0
      tripleo_ansible/roles/tripleo_bootstrap/molecule/default/Dockerfile
  98. 0
      tripleo_ansible/roles/tripleo_bootstrap/molecule/default/molecule.yml
  99. 0
      tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml
  100. 0
      tripleo_ansible/roles/tripleo_bootstrap/molecule/default/prepare.yml

48
setup.cfg

@ -24,7 +24,53 @@ data_files =
share/ansible/tripleo-playbooks/ = tripleo_ansible/playbooks/*
share/ansible/plugins/ = tripleo_ansible/ansible_plugins/*
share/ansible/roles/ = tripleo_ansible/roles/*
share/ansible/roles/tripleo-docker-rm/ = tripleo_ansible/roles/tripleo-docker-rm/*
share/ansible/roles/tripleo_docker_rm/ = tripleo_ansible/roles/tripleo_docker_rm/*
# TODO(cloudnull): Remove this when the role rename is complete
share/ansible/roles/tripleo-config = tripleo_ansible/roles/tripleo_config/*
share/ansible/roles/tripleo-clients-install = tripleo_ansible/roles/tripleo_clients_install/*
share/ansible/roles/tripleo-timezone = tripleo_ansible/roles/tripleo_timezone/*
share/ansible/roles/octavia-overcloud-config = tripleo_ansible/roles/octavia_overcloud_config/*
share/ansible/roles/tripleo-cellv2 = tripleo_ansible/roles/tripleo_cellv2/*
share/ansible/roles/tripleo-securetty = tripleo_ansible/roles/tripleo_securetty/*
share/ansible/roles/tripleo-bootstrap = tripleo_ansible/roles/tripleo_bootstrap/*
share/ansible/roles/tripleo-create-admin = tripleo_ansible/roles/tripleo_create_admin/*
share/ansible/roles/tripleo-ceph-uuid = tripleo_ansible/roles/tripleo_ceph_uuid/*
share/ansible/roles/tripleo-puppet-cache = tripleo_ansible/roles/tripleo_puppet_cache/*
share/ansible/roles/tripleo-sshd = tripleo_ansible/roles/tripleo_sshd/*
share/ansible/roles/tripleo-container-image-prepare = tripleo_ansible/roles/tripleo_container_image_prepare/*
share/ansible/roles/tripleo-podman = tripleo_ansible/roles/tripleo_podman/*
share/ansible/roles/login-defs = tripleo_ansible/roles/login_defs/*
share/ansible/roles/tripleo-container-rm = tripleo_ansible/roles/tripleo_container_rm/*
share/ansible/roles/tripleo-ceph-work-dir = tripleo_ansible/roles/tripleo_ceph_work_dir/*
share/ansible/roles/tripleo-kernel = tripleo_ansible/roles/tripleo_kernel/*
share/ansible/roles/tripleo-ceph-fetch-dir = tripleo_ansible/roles/tripleo_ceph_fetch_dir/*
share/ansible/roles/tripleo-keystone-resources = tripleo_ansible/roles/tripleo_keystone_resources/*
share/ansible/roles/tripleo-hosts-entries = tripleo_ansible/roles/tripleo_hosts_entries/*
share/ansible/roles/tripleo-image-serve = tripleo_ansible/roles/tripleo_image_serve/*
share/ansible/roles/tripleo_docker_rm = tripleo_ansible/roles/tripleo-container-rm/*
share/ansible/roles/tripleo-firewall = tripleo_ansible/roles/tripleo_firewall/*
share/ansible/roles/tripleo-module-load = tripleo_ansible/roles/tripleo_module_load/*
share/ansible/roles/tripleo-ptp = tripleo_ansible/roles/tripleo_ptp/*
share/ansible/roles/octavia-controller-config = tripleo_ansible/roles/octavia_controller_config/*
share/ansible/roles/tripleo-container-manage = tripleo_ansible/roles/tripleo_container_manage/*
share/ansible/roles/tripleo-packages = tripleo_ansible/roles/tripleo_packages/*
share/ansible/roles/tripleo-ssh-known-hosts = tripleo_ansible/roles/tripleo_ssh_known_hosts/*
share/ansible/roles/tripleo-persist = tripleo_ansible/roles/tripleo_persist/*
share/ansible/roles/tripleo-hieradata = tripleo_ansible/roles/tripleo_hieradata/*
share/ansible/roles/tripleo-ceph-run-ansible = tripleo_ansible/roles/tripleo_ceph_run_ansible/*
share/ansible/roles/tripleo-transfer = tripleo_ansible/roles/tripleo_transfer/*
share/ansible/roles/tripleo-container-stop = tripleo_ansible/roles/tripleo_container_stop/*
share/ansible/roles/tripleo-ovs-dpdk = tripleo_ansible/roles/tripleo_ovs_dpdk/*
share/ansible/roles/octavia-controller-post-config = tripleo_ansible/roles/octavia_controller_post_config/*
share/ansible/roles/tripleo-container-tag = tripleo_ansible/roles/tripleo_container_tag/*
share/ansible/roles/tripleo-systemd-wrapper = tripleo_ansible/roles/tripleo_systemd_wrapper/*
share/ansible/roles/tripleo-nova-image-cache = tripleo_ansible/roles/tripleo_nova_image_cache/*
share/ansible/roles/tripleo-validations-package = tripleo_ansible/roles/tripleo_validations_package/*
share/ansible/roles/backup-and-restore = tripleo_ansible/roles/backup_and_restore/*
share/ansible/roles/tripleo-upgrade-hiera = tripleo_ansible/roles/tripleo_upgrade_hiera/*
share/ansible/roles/tripleo-ceph-common = tripleo_ansible/roles/tripleo_ceph_common/*
share/ansible/roles/octavia-undercloud = tripleo_ansible/roles/octavia_undercloud/*
# TODO(cloudnull): Remove this when the role rename is complete
[wheel]
universal = 1

1
tripleo_ansible/roles/backup-and-restore

@ -0,0 +1 @@
backup_and_restore

0
tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml → tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml

0
tripleo_ansible/roles/backup-and-restore/defaults/main.yml → tripleo_ansible/roles/backup_and_restore/defaults/main.yml

0
tripleo_ansible/roles/backup-and-restore/meta/main.yml → tripleo_ansible/roles/backup_and_restore/meta/main.yml

0
tripleo_ansible/roles/backup-and-restore/molecule/default/Dockerfile → tripleo_ansible/roles/backup_and_restore/molecule/default/Dockerfile

0
tripleo_ansible/roles/backup-and-restore/molecule/default/molecule.yml → tripleo_ansible/roles/backup_and_restore/molecule/default/molecule.yml

0
tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml → tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml

0
tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml → tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml

0
tripleo_ansible/roles/backup-and-restore/setup_nfs/tasks/main.yml → tripleo_ansible/roles/backup_and_restore/setup_nfs/tasks/main.yml

0
tripleo_ansible/roles/backup-and-restore/setup_rear/tasks/main.yml → tripleo_ansible/roles/backup_and_restore/setup_rear/tasks/main.yml

0
tripleo_ansible/roles/backup-and-restore/tasks/main.yml → tripleo_ansible/roles/backup_and_restore/tasks/main.yml

0
tripleo_ansible/roles/backup-and-restore/tasks/setup_nfs.yml → tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml

0
tripleo_ansible/roles/backup-and-restore/tasks/setup_rear.yml → tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml

0
tripleo_ansible/roles/backup-and-restore/templates/exports.j2 → tripleo_ansible/roles/backup_and_restore/templates/exports.j2

0
tripleo_ansible/roles/backup-and-restore/templates/local.conf.j2 → tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2

0
tripleo_ansible/roles/backup-and-restore/templates/rescue.conf.j2 → tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2

0
tripleo_ansible/roles/backup-and-restore/vars/redhat.yml → tripleo_ansible/roles/backup_and_restore/vars/redhat.yml

1
tripleo_ansible/roles/login-defs

@ -0,0 +1 @@
login_defs

0
tripleo_ansible/roles/login-defs/defaults/main.yml → tripleo_ansible/roles/login_defs/defaults/main.yml

0
tripleo_ansible/roles/login-defs/meta/main.yml → tripleo_ansible/roles/login_defs/meta/main.yml

0
tripleo_ansible/roles/login-defs/molecule/default/Dockerfile → tripleo_ansible/roles/login_defs/molecule/default/Dockerfile

0
tripleo_ansible/roles/login-defs/molecule/default/molecule.yml → tripleo_ansible/roles/login_defs/molecule/default/molecule.yml

0
tripleo_ansible/roles/login-defs/molecule/default/playbook.yml → tripleo_ansible/roles/login_defs/molecule/default/playbook.yml

0
tripleo_ansible/roles/login-defs/molecule/default/prepare.yml → tripleo_ansible/roles/login_defs/molecule/default/prepare.yml

0
tripleo_ansible/roles/login-defs/molecule/default/verify.yml → tripleo_ansible/roles/login_defs/molecule/default/verify.yml

0
tripleo_ansible/roles/login-defs/tasks/main.yml → tripleo_ansible/roles/login_defs/tasks/main.yml

1
tripleo_ansible/roles/octavia-controller-config

@ -0,0 +1 @@
octavia_controller_config

1
tripleo_ansible/roles/octavia-controller-post-config

@ -0,0 +1 @@
octavia_controller_post_config

1
tripleo_ansible/roles/octavia-overcloud-config

@ -0,0 +1 @@
octavia_overcloud_config

1
tripleo_ansible/roles/octavia-undercloud

@ -0,0 +1 @@
octavia_undercloud

0
tripleo_ansible/roles/octavia-controller-config/handlers/main.yml → tripleo_ansible/roles/octavia_controller_config/handlers/main.yml

0
tripleo_ansible/roles/octavia-controller-config/meta/main.yml → tripleo_ansible/roles/octavia_controller_config/meta/main.yml

0
tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml → tripleo_ansible/roles/octavia_controller_config/tasks/certificate.yml

0
tripleo_ansible/roles/octavia-controller-config/tasks/main.yml → tripleo_ansible/roles/octavia_controller_config/tasks/main.yml

0
tripleo_ansible/roles/octavia-controller-config/tasks/netinterface.yml → tripleo_ansible/roles/octavia_controller_config/tasks/netinterface.yml

0
tripleo_ansible/roles/octavia-controller-config/tasks/netport.yml → tripleo_ansible/roles/octavia_controller_config/tasks/netport.yml

0
tripleo_ansible/roles/octavia-controller-config/tasks/octavia.yml → tripleo_ansible/roles/octavia_controller_config/tasks/octavia.yml

0
tripleo_ansible/roles/octavia-controller-config/templates/ifcfg-br-int.j2 → tripleo_ansible/roles/octavia_controller_config/templates/ifcfg-br-int.j2

0
tripleo_ansible/roles/octavia-controller-config/templates/ifcfg.j2 → tripleo_ansible/roles/octavia_controller_config/templates/ifcfg.j2

0
tripleo_ansible/roles/octavia-controller-post-config/defaults/main.yml → tripleo_ansible/roles/octavia_controller_post_config/defaults/main.yml

0
tripleo_ansible/roles/octavia-controller-post-config/meta/main.yml → tripleo_ansible/roles/octavia_controller_post_config/meta/main.yml

0
tripleo_ansible/roles/octavia-controller-post-config/tasks/main.yml → tripleo_ansible/roles/octavia_controller_post_config/tasks/main.yml

0
tripleo_ansible/roles/octavia-overcloud-config/meta/main.yml → tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml

0
tripleo_ansible/roles/octavia-overcloud-config/tasks/certs_gen.yml → tripleo_ansible/roles/octavia_overcloud_config/tasks/certs_gen.yml

0
tripleo_ansible/roles/octavia-overcloud-config/tasks/main.yml → tripleo_ansible/roles/octavia_overcloud_config/tasks/main.yml

0
tripleo_ansible/roles/octavia-overcloud-config/tasks/network.yml → tripleo_ansible/roles/octavia_overcloud_config/tasks/network.yml

0
tripleo_ansible/roles/octavia-overcloud-config/tasks/quotas.yml → tripleo_ansible/roles/octavia_overcloud_config/tasks/quotas.yml

0
tripleo_ansible/roles/octavia-undercloud/meta/main.yml → tripleo_ansible/roles/octavia_undercloud/meta/main.yml

0
tripleo_ansible/roles/octavia-undercloud/tasks/image_mgmt.yml → tripleo_ansible/roles/octavia_undercloud/tasks/image_mgmt.yml

0
tripleo_ansible/roles/octavia-undercloud/tasks/main.yml → tripleo_ansible/roles/octavia_undercloud/tasks/main.yml

1
tripleo_ansible/roles/tripleo-bootstrap

@ -0,0 +1 @@
tripleo_bootstrap

1
tripleo_ansible/roles/tripleo-cellv2

@ -0,0 +1 @@
tripleo_cellv2

1
tripleo_ansible/roles/tripleo-ceph-common

@ -0,0 +1 @@
tripleo_ceph_common

1
tripleo_ansible/roles/tripleo-ceph-fetch-dir

@ -0,0 +1 @@
tripleo_ceph_fetch_dir

1
tripleo_ansible/roles/tripleo-ceph-run-ansible

@ -0,0 +1 @@
tripleo_ceph_run_ansible

1
tripleo_ansible/roles/tripleo-ceph-uuid

@ -0,0 +1 @@
tripleo_ceph_uuid

1
tripleo_ansible/roles/tripleo-ceph-work-dir

@ -0,0 +1 @@
tripleo_ceph_work_dir

1
tripleo_ansible/roles/tripleo-clients-install

@ -0,0 +1 @@
tripleo_clients_install

1
tripleo_ansible/roles/tripleo-config

@ -0,0 +1 @@
tripleo_config

1
tripleo_ansible/roles/tripleo-container-image-prepare

@ -0,0 +1 @@
tripleo_container_image_prepare

26
tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/DockerfileRegistry

@ -1,26 +0,0 @@
# Molecule managed
# 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.
{% if item.registry is defined %}
FROM {{ item.registry.url }}/{{ item.image }}
{% else %}
FROM {{ item.image }}
{% endif %}
RUN apk add python
ENTRYPOINT ["/entrypoint.sh"]

90
tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml

@ -1,90 +0,0 @@
---
driver:
name: docker
log: true
platforms:
- name: centos7
hostname: centos7
image: centos:7
dockerfile: Dockerfile
pkg_extras: python-setuptools
easy_install:
- pip
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
command: /sbin/init
security_opts:
- seccomp=unconfined
tmpfs:
- /run
- /tmp
capabilities:
- ALL
volumes: &vols
- /run/udev:/run/udev:ro
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /var/run/docker.sock:/var/run/docker.sock
# TODO(cloudnull): when RDO has centos8 repos this test node should be re-enabled.
#
# - name: centos8
# hostname: centos8
# image: centos:8
# dockerfile: Dockerfile
# pkg_extras: python*-setuptools
# environment:
# http_proxy: "{{ lookup('env', 'http_proxy') }}"
# https_proxy: "{{ lookup('env', 'https_proxy') }}"
# command: /sbin/init
# privileged: true
# security_opts:
# - seccomp=unconfined
# tmpfs:
# - /run
# - /tmp
# capabilities:
# - ALL
# volumes: *vols
- name: registry
hostname: registry
image: registry:2
dockerfile: DockerfileRegistry
environment:
<<: *env
command: /etc/docker/registry/config.yml
exposed_ports:
- 5000/udp
- 5000/tcp
published_ports:
- 0.0.0.0:8787:5000/udp
- 0.0.0.0:8787:5000/tcp
provisioner:
name: ansible
config_options:
defaults:
fact_caching: jsonfile
fact_caching_connection: /tmp/molecule/facts
env:
ANSIBLE_STDOUT_CALLBACK: yaml
scenario:
test_sequence:
- destroy
- create
- prepare
- converge
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

91
tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/playbook.yml

@ -1,91 +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.
- name: Converge
hosts: all
serial: 1
roles:
- role: "tripleo-container-image-prepare"
when:
- inventory_hostname != "registry"
tripleo_container_image_prepare_debug: true
tripleo_container_image_prepare_content:
parameter_defaults:
AdditionalArchitectures: []
ContainerImagePrepare:
- modify_append_tag: -updated-TEST
modify_only_with_labels:
- kolla_version
modify_role: tripleo-modify-image
modify_vars:
tasks_from: yum_update.yml
update_repo: gating-repo,delorean-current,quickstart-centos-ceph-nautilus
yum_repos_dir_path: /etc/yum.repos.d
push_destination: "{{ hostvars['registry']['ansible_default_ipv4']['address'] }}:5000"
set:
ceph_alertmanager_image: alertmanager
ceph_alertmanager_namespace: docker.io/prom
ceph_alertmanager_tag: latest
ceph_grafana_image: grafana
ceph_grafana_namespace: docker.io/grafana
ceph_grafana_tag: latest
ceph_image: daemon
ceph_namespace: docker.io/ceph
ceph_node_exporter_image: node-exporter
ceph_node_exporter_namespace: docker.io/prom
ceph_node_exporter_tag: latest
ceph_prometheus_image: prometheus
ceph_prometheus_namespace: docker.io/prom
ceph_prometheus_tag: latest
ceph_tag: v4.0.0-stable-4.0-nautilus-centos-7-x86_64
name_prefix: centos-binary-
name_suffix: ''
namespace: docker.io/tripleomaster
neutron_driver: ovn
tag: master
tag_from_label: null
ContainerImageRegistryCredentials: {}
DockerInsecureRegistryAddress:
- "{{ hostvars['registry']['ansible_default_ipv4']['address'] }}:5000"
DockerRegistryMirror: "https://registry-1.docker.io/"
NeutronMechanismDrivers:
- ovn
StandaloneCount: 1
StandaloneServices:
- OS::TripleO::Services::CACerts
tripleo_container_image_prepare_roles:
- CountDefault: 1
ServicesDefault:
- OS::TripleO::Services::CACerts
description: 'Testing'
disable_constraints: true
name: Standalone
networks:
External:
subnet: external_subnet
InternalApi:
subnet: internal_api_subnet
Storage:
subnet: storage_subnet
StorageMgmt:
subnet: storage_mgmt_subnet
Tenant:
subnet: tenant_subnet
tags:
- primary
- controller
- standalone

43
tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/prepare.yml

@ -1,43 +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.
- name: Prepare
hosts: all
roles:
- role: test_deps
test_deps_setup_tripleo: true
when:
- inventory_hostname != "registry"
post_tasks:
- name: Install docker
package:
name: docker
state: present
- name: Create buildah directory
file:
path: /etc/containers
state: directory
- name: Create buildah registries config
copy:
content: |-
[registries.search]
registries = ['docker.io', 'registry.fedoraproject.org', 'quay.io', 'registry.access.redhat.com', 'registry.centos.org']
[registries.insecure]
registries = ["{{ hostvars['registry']['ansible_default_ipv4']['address'] }}:5000"]
[registries.block]
registries = []
dest: /etc/containers/registries.conf

1
tripleo_ansible/roles/tripleo-container-manage

@ -0,0 +1 @@
tripleo_container_manage

1
tripleo_ansible/roles/tripleo-container-rm

@ -0,0 +1 @@
tripleo_container_rm

1
tripleo_ansible/roles/tripleo-container-stop

@ -0,0 +1 @@
tripleo_container_stop

1
tripleo_ansible/roles/tripleo-container-tag

@ -0,0 +1 @@
tripleo_container_tag

1
tripleo_ansible/roles/tripleo-create-admin

@ -0,0 +1 @@
tripleo_create_admin

2
tripleo_ansible/roles/tripleo-docker-rm

@ -1 +1 @@
tripleo-container-rm
tripleo_docker_rm

1
tripleo_ansible/roles/tripleo-firewall

@ -0,0 +1 @@
tripleo_firewall

1
tripleo_ansible/roles/tripleo-hieradata

@ -0,0 +1 @@
tripleo_hieradata

1
tripleo_ansible/roles/tripleo-hosts-entries

@ -0,0 +1 @@
tripleo_hosts_entries

1
tripleo_ansible/roles/tripleo-image-serve

@ -0,0 +1 @@
tripleo_image_serve

1
tripleo_ansible/roles/tripleo-kernel

@ -0,0 +1 @@
tripleo_kernel

1
tripleo_ansible/roles/tripleo-keystone-resources

@ -0,0 +1 @@
tripleo_keystone_resources

1
tripleo_ansible/roles/tripleo-module-load

@ -0,0 +1 @@
tripleo_module_load

1
tripleo_ansible/roles/tripleo-nova-image-cache

@ -0,0 +1 @@
tripleo_nova_image_cache

1
tripleo_ansible/roles/tripleo-ovs-dpdk

@ -0,0 +1 @@
tripleo_ovs_dpdk

1
tripleo_ansible/roles/tripleo-packages

@ -0,0 +1 @@
tripleo_packages

1
tripleo_ansible/roles/tripleo-persist

@ -0,0 +1 @@
tripleo_persist

1
tripleo_ansible/roles/tripleo-podman

@ -0,0 +1 @@
tripleo_podman

1
tripleo_ansible/roles/tripleo-ptp

@ -0,0 +1 @@
tripleo_ptp

1
tripleo_ansible/roles/tripleo-puppet-cache

@ -0,0 +1 @@
tripleo_puppet_cache

1
tripleo_ansible/roles/tripleo-securetty

@ -0,0 +1 @@
tripleo_securetty

1
tripleo_ansible/roles/tripleo-ssh-known-hosts

@ -0,0 +1 @@
tripleo_ssh_known_hosts

1
tripleo_ansible/roles/tripleo-sshd

@ -0,0 +1 @@
tripleo_sshd

1
tripleo_ansible/roles/tripleo-systemd-wrapper

@ -0,0 +1 @@
tripleo_systemd_wrapper

1
tripleo_ansible/roles/tripleo-timezone

@ -0,0 +1 @@
tripleo_timezone

1
tripleo_ansible/roles/tripleo-transfer

@ -0,0 +1 @@
tripleo_transfer

1
tripleo_ansible/roles/tripleo-upgrade-hiera

@ -0,0 +1 @@
tripleo_upgrade_hiera

1
tripleo_ansible/roles/tripleo-validations-package

@ -0,0 +1 @@
tripleo_validations_package

37
tripleo_ansible/roles/tripleo-validations-package/molecule/default/Dockerfile

@ -1,37 +0,0 @@
# Molecule managed
# 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.
{% if item.registry is defined %}
FROM {{ item.registry.url }}/{{ item.image }}
{% else %}
FROM {{ item.image }}
{% endif %}
RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi
{% for pkg in item.easy_install | default([]) %}
# install pip for centos where there is no python-pip rpm in default repos
RUN easy_install {{ pkg }}
{% endfor %}
CMD ["sh", "-c", "while true; do sleep 10000; done"]

0
tripleo_ansible/roles/tripleo-bootstrap/defaults/main.yml → tripleo_ansible/roles/tripleo_bootstrap/defaults/main.yml

0
tripleo_ansible/roles/tripleo-bootstrap/meta/main.yml → tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml

0
tripleo_ansible/roles/tripleo-bootstrap/molecule/default/Dockerfile → tripleo_ansible/roles/tripleo_bootstrap/molecule/default/Dockerfile

0
tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml → tripleo_ansible/roles/tripleo_bootstrap/molecule/default/molecule.yml

0
tripleo_ansible/roles/tripleo-bootstrap/molecule/default/playbook.yml → tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml

0
tripleo_ansible/roles/tripleo-bootstrap/molecule/default/prepare.yml → tripleo_ansible/roles/tripleo_bootstrap/molecule/default/prepare.yml

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save