diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-07-05 12:00:12 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-07-10 14:40:32 +0400 |
| commit | e8905d1c928a2e674ff399d96384466572f985b3 (patch) | |
| tree | 8bf90a223a0a89f62011780dd3a5ce9977ab145b /mcp/patches/salt-formula-aodh | |
| parent | 45c9f16e592d5d205d55189baef5fb5c01c8a6fc (diff) | |
[virtual] Update OpenStack version to Stein
Change-Id: I9c1e97144ffd46040d32a0edf8253fc393b73c89
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/salt-formula-aodh')
| -rw-r--r-- | mcp/patches/salt-formula-aodh/0001-Extend-apache-service-state.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/mcp/patches/salt-formula-aodh/0001-Extend-apache-service-state.patch b/mcp/patches/salt-formula-aodh/0001-Extend-apache-service-state.patch new file mode 100644 index 000000000..9bf85efa0 --- /dev/null +++ b/mcp/patches/salt-formula-aodh/0001-Extend-apache-service-state.patch @@ -0,0 +1,47 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2019 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Wed, 10 Jul 2019 10:18:58 +0400 +Subject: [PATCH] Extend apache service state + +diff --git a/aodh/server.sls b/aodh/server.sls +index 04b0395..258e5fe 100644 +--- a/aodh/server.sls ++++ b/aodh/server.sls +@@ -183,20 +183,16 @@ aodh_api_config: + + {%- endif %} + +-aodh_apache_restart: +- service.running: +- - enable: true +- - name: apache2 +- {%- if grains.get('noservices') %} +- - onlyif: /bin/false +- {%- endif %} +- - watch: +- - file: /etc/aodh/aodh.conf +- {%- if pillar.get('apache', {}).get('server', {}).get('site', {}).aodh is defined %} +- - apache_enable_aodh_wsgi +- {%- else %} +- - file: aodh_api_apache_config +- {%- endif %} ++extend: ++ apache_service: ++ service.running: ++ - watch: ++ - file: /etc/aodh/aodh.conf ++ {%- if pillar.get('apache', {}).get('server', {}).get('site', {}).aodh is defined %} ++ - apache_enable_aodh_wsgi ++ {%- else %} ++ - file: aodh_api_apache_config ++ {%- endif %} + + {%- endif %} + |