diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-14 22:01:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-14 22:01:04 +0000 |
| commit | ebaa982f0e1c764efa457e4ca7dfb4d1da7e5776 (patch) | |
| tree | 199cc26c3e3a96678e81081c661f6e6af0d0ec35 /docker | |
| parent | 4dabd2c487d998caf43fcee9f906ba27985242f6 (diff) | |
| parent | f24d5d4c0237d2703cf2744aa6db65865401e94e (diff) | |
Merge "Make containerized nova-api run with httpd"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/nova-api.yaml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index da461049..c73ad046 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -64,9 +64,6 @@ outputs: map_merge: - get_attr: [NovaApiBase, role_data, config_settings] - apache::default_vhost: false - nova_wsgi_enabled: false - nova::api::service_name: '%{::nova::params::api_service_name}' - nova::wsgi::apache_api::ssl: false step_config: &step_config list_join: - "\n" @@ -82,7 +79,7 @@ outputs: config_image: {get_param: DockerNovaConfigImage} kolla_config: /var/lib/kolla/config_files/nova_api.json: - command: /usr/bin/nova-api + command: /usr/sbin/httpd -DFOREGROUND config_files: - source: "/var/lib/kolla/config_files/src/*" dest: "/" @@ -112,7 +109,7 @@ outputs: user: root volumes: - /var/log/containers/nova:/var/log/nova - command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova'] + command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R nova:nova /var/log/nova'] step_3: nova_api_db_sync: start_order: 0 @@ -163,7 +160,7 @@ outputs: start_order: 2 image: *nova_api_image net: host - user: nova + user: root privileged: true restart: always volumes: |