diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/cinder-api.yaml | 2 | ||||
| -rw-r--r-- | docker/services/heat-api.yaml | 2 | ||||
| -rw-r--r-- | docker/services/keystone.yaml | 2 | ||||
| -rw-r--r-- | docker/services/nova-api.yaml | 2 | ||||
| -rw-r--r-- | docker/services/swift-ringbuilder.yaml | 23 | ||||
| -rw-r--r-- | docker/services/zaqar.yaml | 3 |
6 files changed, 30 insertions, 4 deletions
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index 519b2328..93d09ca0 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -163,6 +163,8 @@ outputs: user: root privileged: false restart: always + healthcheck: + test: /bin/true volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index 54c7bedd..6c1621f1 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -136,6 +136,8 @@ outputs: user: root privileged: false restart: always + healthcheck: + test: /bin/true volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 4c2c1d16..97b4c5d5 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -175,6 +175,8 @@ outputs: privileged: false restart: always command: ['/bin/bash', '-c', '/usr/local/bin/kolla_set_configs && /usr/sbin/crond -n'] + healthcheck: + test: /bin/true volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index 37c4da5b..7142b70e 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -196,6 +196,8 @@ outputs: user: root privileged: false restart: always + healthcheck: + test: /bin/true volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml index e4e2c7d2..2a44f703 100644 --- a/docker/services/swift-ringbuilder.yaml +++ b/docker/services/swift-ringbuilder.yaml @@ -7,6 +7,10 @@ parameters: DockerSwiftConfigImage: description: The container image to use for the swift config_volume type: string + DockerSwiftRingbuilderConfigImage: + description: Fake parameter to bypass config_volume yaml validation + type: string + default: '' ServiceData: default: {} description: Dictionary packing service data @@ -92,9 +96,22 @@ outputs: service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: - config_volume: 'swift' + config_volume: 'swift_ringbuilder' puppet_tags: exec,fetch_swift_ring_tarball,extract_swift_ring_tarball,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance,create_swift_ring_tarball,upload_swift_ring_tarball step_config: *step_config - config_image: {get_param: DockerSwiftConfigImage} + config_image: &swift_ringbuilder_image {get_param: DockerSwiftConfigImage} kolla_config: {} - docker_config: {} + docker_config: + step_3: + swift_copy_rings: + image: *swift_ringbuilder_image + user: root + detach: false + command: + # Use bash to run the cp command so that wildcards can be used + - '/bin/bash' + - '-c' + - 'cp -v -a -t /etc/swift /swift_ringbuilder/etc/swift/*.gz /swift_ringbuilder/etc/swift/*.builder /swift_ringbuilder/etc/swift/backups' + volumes: + - /var/lib/config-data/puppet-generated/swift/etc/swift:/etc/swift:rw + - /var/lib/config-data/swift_ringbuilder:/swift_ringbuilder:ro diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index b6fb4001..34f2e439 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -130,7 +130,8 @@ outputs: - - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro - /var/log/containers/zaqar:/var/log/zaqar - command: "/usr/bin/bootstrap_host_exec zaqar su zaqar -s /bin/bash -c 'zaqar-sql-db-manage upgrade head'" + - /var/log/containers/httpd/zaqar:/var/log/httpd + command: "/usr/bin/bootstrap_host_exec zaqar_api su zaqar -s /bin/bash -c 'zaqar-sql-db-manage upgrade head'" - {} - step_4: zaqar: |