From 98118b6294b750e3b344ff7fc74492ac229bd866 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 6 Feb 2020 09:46:50 -0500 Subject: [PATCH] Replace '' by [] when a bind mount isn't needed To avoid empty volumes like: { (...) "volumes": [ "/etc/puppet:/etc/puppet:ro", (...) "", "" ], } Replace '' by [], so heat won't create an item in the list. It helps to have idempotent containers, since podman_container module will compare the list of volumes that is given in parameters (containing the empty entries) vs the list of volumes actually in podman inspect. Replacing to [] clears out empty volumes and makes these containers idempotent when podman_container module is used to deploy containers. Change-Id: I228b01009e7d9980bee5480778dbc88b9e226297 --- deployment/aodh/aodh-api-container-puppet.yaml | 18 ++++++++---------- .../cinder/cinder-api-container-puppet.yaml | 18 ++++++++---------- .../gnocchi/gnocchi-api-container-puppet.yaml | 18 ++++++++---------- .../heat/heat-api-cfn-container-puppet.yaml | 18 ++++++++---------- deployment/heat/heat-api-container-puppet.yaml | 18 ++++++++---------- .../horizon/horizon-container-puppet.yaml | 18 ++++++++---------- .../ironic/ironic-api-container-puppet.yaml | 18 ++++++++---------- .../keystone/keystone-container-puppet.yaml | 18 ++++++++---------- .../manila/manila-api-container-puppet.yaml | 16 ++++++++-------- deployment/nova/nova-api-container-puppet.yaml | 18 ++++++++---------- .../nova/nova-metadata-container-puppet.yaml | 18 ++++++++---------- .../octavia/octavia-api-container-puppet.yaml | 18 ++++++++---------- .../placement-api-container-puppet.yaml | 18 ++++++++---------- deployment/zaqar/zaqar-container-puppet.yaml | 18 ++++++++---------- 14 files changed, 112 insertions(+), 138 deletions(-) diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index e8303a516c..f53a349384 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -229,16 +229,14 @@ outputs: - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro - /var/log/containers/aodh:/var/log/aodh - /var/log/containers/httpd/aodh-api:/var/log/httpd - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 9126b234bf..3600957fcb 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -325,16 +325,14 @@ outputs: - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro - /var/log/containers/cinder:/var/log/cinder:z - /var/log/containers/httpd/cinder-api:/var/log/httpd:z - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS cinder_api_cron: diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index b7a65ca7c9..87b8af64b0 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -342,16 +342,14 @@ outputs: - /var/log/containers/gnocchi:/var/log/gnocchi:z - /var/log/containers/httpd/gnocchi-api:/var/log/httpd:z - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 8fda79da2b..83d5e4684b 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -200,16 +200,14 @@ outputs: - - /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/heat_api_cfn:/var/lib/kolla/config_files/src:ro - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: {get_attr: [HeatApiCfnLogging, host_prep_tasks]} diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 571f127eed..cc70e2778f 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -242,16 +242,14 @@ outputs: - - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/heat_api:/var/lib/kolla/config_files/src:ro - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: map_merge: - {get_param: HeatApiOptEnvVars} diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 89816cdc7c..4939c44953 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -276,16 +276,14 @@ outputs: - /var/log/containers/httpd/horizon:/var/log/httpd:z - /var/tmp/:/var/tmp/:z - /var/www/:/var/www/:ro - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS # Installed plugins: diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index edca1b53f0..7d4899081f 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -262,16 +262,14 @@ outputs: - /var/lib/config-data/puppet-generated/ironic_api:/var/lib/kolla/config_files/src:ro - /var/log/containers/ironic:/var/log/ironic:z - /var/log/containers/httpd/ironic-api:/var/log/httpd:z - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 7ea1e9284e..ff21108f66 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -634,16 +634,14 @@ outputs: - - /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/keystone:/var/lib/kolla/config_files/src:ro - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: map_merge: - {get_attr: [KeystoneLogging, environment]} diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index e9eb3a65c9..44b3269cd1 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -232,14 +232,14 @@ outputs: - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro - /var/log/containers/manila:/var/log/manila:z - /var/log/containers/httpd/manila-api:/var/log/httpd:z - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS metadata_settings: diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index abae705b3a..639abb1892 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -416,16 +416,14 @@ outputs: - - /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS nova_wait_for_api_service: diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 0ae551f102..a613af7caf 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -227,16 +227,14 @@ outputs: - - /var/lib/kolla/config_files/nova_metadata.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/nova_metadata:/var/lib/kolla/config_files/src:ro - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS deploy_steps_tasks: diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index ae56b11ac3..fee9f11d51 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-api-container-puppet.yaml @@ -314,16 +314,14 @@ outputs: - /var/log/containers/octavia:/var/log/octavia:z - /var/run/octavia:/var/run/octavia:shared,z - /var/log/containers/httpd/octavia-api:/var/log/httpd:z - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - if: diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index d13fddaf64..3cc64c35e1 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -294,16 +294,14 @@ outputs: - - /var/lib/kolla/config_files/placement_api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/placement:/var/lib/kolla/config_files/src:ro - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS placement_wait_for_service: diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index 7cf08735f3..368ad9d9df 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -348,16 +348,14 @@ outputs: - /var/lib/config-data/puppet-generated/zaqar:/var/lib/kolla/config_files/src:ro - /var/log/containers/zaqar:/var/log/zaqar - /var/log/containers/httpd/zaqar:/var/log/httpd - - - if: - - internal_tls_enabled - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - '' - - - if: - - internal_tls_enabled - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - '' + - if: + - internal_tls_enabled + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - [] + - if: + - internal_tls_enabled + - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro + - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS zaqar_websocket: