Merge "Remove baremetal cron jobs on docker upgrade"

diff --combined docker/services/nova-api.yaml
index be2c8a5,dd4f96c..37c4da5
--- 1/docker/services/nova-api.yaml
--- 2/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@@ -36,13 -36,6 +36,13 @@@ parameters
      default: {}
      description: Parameters specific to the role
      type: json
 +  EnableInternalTLS:
 +    type: boolean
 +    default: false
 +
 +conditions:
 +
 +  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
  
  resources:
  
@@@ -71,6 -64,9 +71,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"
@@@ -86,7 -82,7 +86,7 @@@
          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: "/"
@@@ -116,7 -112,7 +116,7 @@@
              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
@@@ -128,7 -124,6 +128,7 @@@
                list_concat:
                  - {get_attr: [ContainersCommon, volumes]}
                  -
 +                  - /var/lib/config-data/nova/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                    - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
                    - /var/log/containers/nova:/var/log/nova
              command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage api_db sync'"
@@@ -168,7 -163,7 +168,7 @@@
              start_order: 2
              image: *nova_api_image
              net: host
 -            user: nova
 +            user: root
              privileged: true
              restart: always
              volumes:
@@@ -178,16 -173,6 +178,16 @@@
                    - /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
                    - /var/log/containers/nova:/var/log/nova
 +                  -
 +                    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_api_cron:
@@@ -225,3 -210,7 +225,7 @@@
          - name: Stop and disable nova_api service
            tags: step2
            service: name=openstack-nova-api state=stopped enabled=no
+         - name: remove old nova cron jobs
+           file:
+             path: /var/spool/cron/nova
+             state: absent