From f24d5d4c0237d2703cf2744aa6db65865401e94e Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 19 Jun 2017 15:21:15 +0300
Subject: Make containerized nova-api run with httpd

The non-containerized version will run over httpd [1], and for the
containerized TLS work, it is needed in the container version as well.

[1] Iac35b7ddcd8a800901548c75ca8d5083ad17e4d3

bp tls-via-certmonger-containers

Depends-On: I1c5f13039414f17312f91a5e0fd02019aa08e00e
Change-Id: I2c39a2957fd95dd261b5b8c4df5e66e00a68d2f7
---
 docker/services/nova-api.yaml                   |  9 +++------
 environments/docker-centos-tripleoupstream.yaml | 11 +++++------
 2 files changed, 8 insertions(+), 12 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:
diff --git a/environments/docker-centos-tripleoupstream.yaml b/environments/docker-centos-tripleoupstream.yaml
index 47f8e528..01a118e4 100644
--- a/environments/docker-centos-tripleoupstream.yaml
+++ b/environments/docker-centos-tripleoupstream.yaml
@@ -1,6 +1,6 @@
-# Generated with the following on 2017-07-12T11:40:50.219622
+# Generated with the following on 2017-08-11T04:58:59.567629
 #
-#   overcloud container image prepare --env-file environments/docker-centos-tripleoupstream.yaml
+#   openstack overcloud container image prepare --env-file environments/docker-centos-tripleoupstream.yaml
 #
 
 parameter_defaults:
@@ -9,6 +9,7 @@ parameter_defaults:
   DockerAodhEvaluatorImage: tripleoupstream/centos-binary-aodh-evaluator:latest
   DockerAodhListenerImage: tripleoupstream/centos-binary-aodh-listener:latest
   DockerAodhNotifierImage: tripleoupstream/centos-binary-aodh-notifier:latest
+  DockerBarbicanApiImage: tripleoupstream/centos-binary-barbican-api:latest
   DockerCeilometerCentralImage: tripleoupstream/centos-binary-ceilometer-central:latest
   DockerCeilometerComputeImage: tripleoupstream/centos-binary-ceilometer-compute:latest
   DockerCeilometerConfigImage: tripleoupstream/centos-binary-ceilometer-central:latest
@@ -45,8 +46,8 @@ parameter_defaults:
   DockerHeatEngineImage: tripleoupstream/centos-binary-heat-engine:latest
   DockerHorizonConfigImage: tripleoupstream/centos-binary-horizon:latest
   DockerHorizonImage: tripleoupstream/centos-binary-horizon:latest
-  DockerIronicApiImage: tripleoupstream/centos-binary-ironic-api:latest
   DockerIronicApiConfigImage: tripleoupstream/centos-binary-ironic-api:latest
+  DockerIronicApiImage: tripleoupstream/centos-binary-ironic-api:latest
   DockerIronicConductorImage: tripleoupstream/centos-binary-ironic-conductor:latest
   DockerIronicConfigImage: tripleoupstream/centos-binary-ironic-pxe:latest
   DockerIronicInspectorConfigImage: tripleoupstream/centos-binary-ironic-inspector:latest
@@ -82,7 +83,7 @@ parameter_defaults:
   DockerNovaComputeImage: tripleoupstream/centos-binary-nova-compute:latest
   DockerNovaComputeIronicImage: tripleoupstream/centos-binary-nova-compute-ironic:latest
   DockerNovaConductorImage: tripleoupstream/centos-binary-nova-conductor:latest
-  DockerNovaConfigImage: tripleoupstream/centos-binary-nova-base:latest
+  DockerNovaConfigImage: tripleoupstream/centos-binary-nova-api:latest
   DockerNovaConsoleauthImage: tripleoupstream/centos-binary-nova-consoleauth:latest
   DockerNovaLibvirtConfigImage: tripleoupstream/centos-binary-nova-compute:latest
   DockerNovaLibvirtImage: tripleoupstream/centos-binary-nova-libvirt:latest
@@ -100,8 +101,6 @@ parameter_defaults:
   DockerOctaviaHealthManagerImage: tripleoupstream/centos-binary-octavia-health-manager:latest
   DockerOctaviaHousekeepingImage: tripleoupstream/centos-binary-octavia-housekeeping:latest
   DockerOctaviaWorkerImage: tripleoupstream/centos-binary-octavia-worker:latest
-  DockerOpendaylightApiImage: tripleoupstream/centos-binary-opendaylight:latest
-  DockerOpendaylightConfigImage: tripleoupstream/centos-binary-opendaylight:latest
   DockerOpenvswitchImage: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
   DockerPankoApiImage: tripleoupstream/centos-binary-panko-api:latest
   DockerPankoConfigImage: tripleoupstream/centos-binary-panko-api:latest
-- 
cgit 1.2.3-korg