Browse Source

Rename docker_config_scripts to container_config_scripts

Change-Id: Iabd65560c2fc28b3aeca07a21efa861c4c583c01
changes/72/641172/2
Emilien Macchi 3 years ago
parent
commit
160cddda3f
  1. 4
      common/deploy-steps-tasks.yaml
  2. 8
      common/services.yaml
  3. 0
      container_config_scripts/__init__.py
  4. 0
      container_config_scripts/nova_cell_v2_discover_host.py
  5. 0
      container_config_scripts/nova_statedir_ownership.py
  6. 0
      container_config_scripts/nova_wait_for_placement_service.py
  7. 0
      container_config_scripts/pyshim.sh
  8. 0
      container_config_scripts/tests/__init__.py
  9. 4
      container_config_scripts/tests/test_nova_statedir_ownership.py
  10. 2
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml
  11. 2
      deployment/cinder/cinder-volume-pacemaker-puppet.yaml
  12. 2
      deployment/database/mysql-pacemaker-puppet.yaml
  13. 2
      deployment/database/redis-pacemaker-puppet.yaml
  14. 2
      deployment/haproxy/haproxy-container-puppet.yaml
  15. 2
      deployment/haproxy/haproxy-pacemaker-puppet.yaml
  16. 2
      deployment/ironic/ironic-conductor-container-puppet.yaml
  17. 2
      deployment/manila/manila-share-pacemaker-puppet.yaml
  18. 2
      deployment/neutron/neutron-dhcp-container-puppet.yaml
  19. 2
      deployment/neutron/neutron-l3-container-puppet.yaml
  20. 2
      deployment/neutron/neutron-ovs-agent-container-puppet.yaml
  21. 4
      deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
  22. 2
      deployment/nova/nova-api-container-puppet.yaml
  23. 8
      deployment/nova/nova-compute-common-container-puppet.yaml
  24. 6
      deployment/nova/nova-compute-container-puppet.yaml
  25. 6
      deployment/nova/nova-ironic-container-puppet.yaml
  26. 2
      deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
  27. 2
      deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
  28. 2
      deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
  29. 2
      deployment/swift/swift-proxy-container-puppet.yaml
  30. 6
      docker/services/containers-common.yaml
  31. 2
      docker/services/ovn-metadata.yaml
  32. 2
      docker/services/pacemaker/ovn-dbs.yaml
  33. 2
      tools/yaml-validate.py
  34. 4
      tox.ini

4
common/deploy-steps-tasks.yaml

@ -244,11 +244,11 @@
force: yes
mode: "{{ item[1].mode | default('0600', true) }}"
setype: svirt_sandbox_file_t
loop: "{{ role_data_docker_config_scripts | dictsort }}"
loop: "{{ role_data_container_config_scripts | dictsort }}"
loop_control:
label: "{{ item[0] }}"
vars:
role_data_docker_config_scripts: "{{ lookup('file', tripleo_role_name + '/docker_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
role_data_container_config_scripts: "{{ lookup('file', tripleo_role_name + '/container_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
tags:
- container_config_scripts

8
common/services.yaml

@ -102,11 +102,11 @@ resources:
value:
yaql:
expression:
# select 'docker_config_scripts' only from services that have it
coalesce($.data.service_names, []).zip(coalesce($.data.docker_config_scripts, [])).where($[1] != null).select($[1]).reduce($1.mergeWith($2), {})
# select 'container_config_scripts' only from services that have it
coalesce($.data.service_names, []).zip(coalesce($.data.container_config_scripts, [])).where($[1] != null).select($[1]).reduce($1.mergeWith($2), {})
data:
service_names: {get_attr: [ServiceChain, role_data, service_names]}
docker_config_scripts: {get_attr: [ServiceChain, role_data, docker_config_scripts]}
container_config_scripts: {get_attr: [ServiceChain, role_data, container_config_scripts]}
MonitoringSubscriptionsConfig:
type: OS::Heat::Value
@ -368,7 +368,7 @@ outputs:
puppet_config: {get_attr: [PuppetConfig, value]}
kolla_config: {get_attr: [KollaConfig, value]}
docker_config: {get_attr: [DockerConfig, value]}
docker_config_scripts: {get_attr: [DockerConfigScripts, value]}
container_config_scripts: {get_attr: [DockerConfigScripts, value]}
container_puppet_tasks:
map_merge:
- {get_attr: [ContainerPuppetTasks, value]}

0
docker_config_scripts/__init__.py → container_config_scripts/__init__.py

0
docker_config_scripts/nova_cell_v2_discover_host.py → container_config_scripts/nova_cell_v2_discover_host.py

0
docker_config_scripts/nova_statedir_ownership.py → container_config_scripts/nova_statedir_ownership.py

0
docker_config_scripts/nova_wait_for_placement_service.py → container_config_scripts/nova_wait_for_placement_service.py

0
docker_config_scripts/pyshim.sh → container_config_scripts/pyshim.sh

0
docker_config_scripts/tests/__init__.py → container_config_scripts/tests/__init__.py

4
docker_config_scripts/tests/test_nova_statedir_ownership.py → container_config_scripts/tests/test_nova_statedir_ownership.py

@ -20,9 +20,9 @@ import stat
from oslotest import base
from docker_config_scripts.nova_statedir_ownership import \
from container_config_scripts.nova_statedir_ownership import \
NovaStatedirOwnershipManager
from docker_config_scripts.nova_statedir_ownership import PathManager
from container_config_scripts.nova_statedir_ownership import PathManager
# Real chown would require root, so in order to test this we need to fake
# all of the methods that interact with the filesystem

2
deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@ -165,7 +165,7 @@ outputs:
- path: /var/log/cinder
owner: cinder:cinder
recurse: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_3:
cinder_backup_init_logs:

2
deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@ -149,7 +149,7 @@ outputs:
- path: /var/log/cinder
owner: cinder:cinder
recurse: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_3:
cinder_volume_init_logs:

2
deployment/database/mysql-pacemaker-puppet.yaml

@ -198,7 +198,7 @@ outputs:
owner: mysql:mysql
perm: '0600'
optional: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_1:
mysql_data_ownership:

2
deployment/database/redis-pacemaker-puppet.yaml

@ -205,7 +205,7 @@ outputs:
owner: root:root
perm: '0600'
optional: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_2:
map_merge:

2
deployment/haproxy/haproxy-container-puppet.yaml

@ -241,7 +241,7 @@ outputs:
owner: haproxy:haproxy
recurse: true
optional: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_1:
map_merge:

2
deployment/haproxy/haproxy-pacemaker-puppet.yaml

@ -225,7 +225,7 @@ outputs:
owner: haproxy:haproxy
perm: '0600'
optional: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_2:
haproxy_restart_bundle:

2
deployment/ironic/ironic-conductor-container-puppet.yaml

@ -453,7 +453,7 @@ outputs:
- path: /var/log/ironic
owner: ironic:ironic
recurse: true
docker_config_scripts:
container_config_scripts:
create_swift_temp_url_key.sh:
mode: "0700"
content: |

2
deployment/manila/manila-share-pacemaker-puppet.yaml

@ -130,7 +130,7 @@ outputs:
- path: /var/log/manila
owner: manila:manila
recurse: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_3:
manila_share_init_logs:

2
deployment/neutron/neutron-dhcp-container-puppet.yaml

@ -266,7 +266,7 @@ outputs:
owner: neutron:neutron
- path: /etc/pki/tls/private/neutron.key
owner: neutron:neutron
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_2:
create_dnsmasq_wrapper:

2
deployment/neutron/neutron-l3-container-puppet.yaml

@ -235,7 +235,7 @@ outputs:
- path: /var/lib/neutron
owner: neutron:neutron
recurse: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_2:
create_keepalived_wrapper:

2
deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@ -239,7 +239,7 @@ outputs:
- path: /var/log/neutron
owner: neutron:neutron
recurse: true
docker_config_scripts:
container_config_scripts:
neutron_ovs_agent_launcher.sh:
mode: "0755"
content:

4
deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml

@ -143,8 +143,8 @@ outputs:
- /run/openvswitch:/run/openvswitch
kolla_config:
get_attr: [NeutronOvsAgent, role_data, kolla_config]
docker_config_scripts:
get_attr: [NeutronOvsAgent, role_data, docker_config_scripts]
container_config_scripts:
get_attr: [NeutronOvsAgent, role_data, container_config_scripts]
docker_config:
get_attr: [NeutronOvsAgent, role_data, docker_config]
metadata_settings:

2
deployment/nova/nova-api-container-puppet.yaml

@ -307,7 +307,7 @@ outputs:
- path: /var/log/nova
owner: nova:nova
recurse: true
docker_config_scripts:
container_config_scripts:
nova_api_ensure_default_cell.sh:
mode: "0700"
content:

8
deployment/nova/nova-compute-common-container-puppet.yaml

@ -34,15 +34,15 @@ parameters:
type: json
outputs:
docker_config_scripts:
container_config_scripts:
description: Shared docker config scripts
value:
nova_statedir_ownership.py:
mode: "0700"
content: { get_file: ../../docker_config_scripts/nova_statedir_ownership.py }
content: { get_file: ../../container_config_scripts/nova_statedir_ownership.py }
nova_wait_for_placement_service.py:
mode: "0700"
content: { get_file: ../../docker_config_scripts/nova_wait_for_placement_service.py }
content: { get_file: ../../container_config_scripts/nova_wait_for_placement_service.py }
nova_cell_v2_discover_host.py:
mode: "0700"
content: { get_file: ../../docker_config_scripts/nova_cell_v2_discover_host.py }
content: { get_file: ../../container_config_scripts/nova_cell_v2_discover_host.py }

6
deployment/nova/nova-compute-container-puppet.yaml

@ -479,10 +479,10 @@ outputs:
USER: {get_param: CephClientUserName}
owner: nova:nova
perm: '0600'
docker_config_scripts:
container_config_scripts:
map_merge:
- {get_attr: [ContainersCommon, docker_config_scripts]}
- {get_attr: [NovaComputeCommon, docker_config_scripts]}
- {get_attr: [ContainersCommon, container_config_scripts]}
- {get_attr: [NovaComputeCommon, container_config_scripts]}
docker_config:
step_3:
nova_statedir_owner:

6
deployment/nova/nova-ironic-container-puppet.yaml

@ -115,10 +115,10 @@ outputs:
- path: /var/log/nova
owner: nova:nova
recurse: true
docker_config_scripts:
container_config_scripts:
map_merge:
- {get_attr: [ContainersCommon, docker_config_scripts]}
- {get_attr: [NovaComputeCommon, docker_config_scripts]}
- {get_attr: [ContainersCommon, container_config_scripts]}
- {get_attr: [NovaComputeCommon, container_config_scripts]}
docker_config:
step_3:
nova_statedir_owner:

2
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

@ -155,7 +155,7 @@ outputs:
optional: true
# When using pacemaker we don't launch the container, instead that is done by pacemaker
# itself.
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_1:
rabbitmq_bootstrap:

2
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml

@ -155,7 +155,7 @@ outputs:
optional: true
# When using pacemaker we don't launch the container, instead that is done by pacemaker
# itself.
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_1:
rabbitmq_bootstrap:

2
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

@ -155,7 +155,7 @@ outputs:
optional: true
# When using pacemaker we don't launch the container, instead that is done by pacemaker
# itself.
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_1:
rabbitmq_bootstrap:

2
deployment/swift/swift-proxy-container-puppet.yaml

@ -316,7 +316,7 @@ outputs:
dest: "/"
merge: true
preserve_properties: true
docker_config_scripts:
container_config_scripts:
create_swift_secret.sh:
mode: "0700"
content: |

6
docker/services/containers-common.yaml

@ -48,7 +48,7 @@ conditions:
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
outputs:
docker_config_scripts:
container_config_scripts:
description: Shared docker config scripts
value:
docker_puppet_apply.sh:
@ -85,7 +85,7 @@ outputs:
exit $rc
pyshim.sh:
mode: "0700"
content: { get_file: ../../docker_config_scripts/pyshim.sh }
content: { get_file: ../../container_config_scripts/pyshim.sh }
volumes_base:
description: Base volume list
@ -120,7 +120,7 @@ outputs:
- /etc/puppet:/etc/puppet:ro
docker_puppet_apply_volumes:
description: Common volumes needed to run the docker_puppet_apply.sh from docker_config_scripts
description: Common volumes needed to run the docker_puppet_apply.sh from container_config_scripts
value:
list_concat:
- *volumes_base

2
docker/services/ovn-metadata.yaml

@ -131,7 +131,7 @@ outputs:
- path: /var/lib/neutron
owner: neutron:neutron
recurse: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_2:
create_haproxy_wrapper:

2
docker/services/pacemaker/ovn-dbs.yaml

@ -124,7 +124,7 @@ outputs:
merge: true
preserve_properties: true
optional: true
docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
docker_config:
step_3:
ovn_dbs_restart_bundle:

2
tools/yaml-validate.py

@ -65,7 +65,7 @@ OPTIONAL_DOCKER_SECTIONS = ['container_puppet_tasks', 'upgrade_tasks',
'host_prep_tasks', 'metadata_settings',
'kolla_config', 'global_config_settings',
'external_deploy_tasks', 'external_post_deploy_tasks',
'docker_config_scripts', 'step_config',
'container_config_scripts', 'step_config',
'monitoring_subscription',
'external_update_tasks', 'external_upgrade_tasks']
# ansible tasks cannot be an empty dict or ansible is unhappy

4
tox.ini

@ -26,11 +26,11 @@ commands =
python ./tools/yaml-validate.py .
bash -c ./tools/roles-data-validation.sh
bash -c ./tools/check-up-to-date.sh
flake8 ./docker_config_scripts/
flake8 ./container_config_scripts/
[testenv:flake8]
commands =
flake8 ./docker_config_scripts/
flake8 ./container_config_scripts/
[testenv:templates]
basepython = python3

Loading…
Cancel
Save