diff options
| author |   carey.xu <carey.xuhan@huawei.com> | 2016-03-14 15:38:33 +0800 |
|---|---|---|
| committer | carey xu <carey.xuhan@huawei.com> | 2016-03-18 06:41:56 +0000 |
| commit | 00826d9f9131b5b3d76d01c13912496ec6067204 (patch) | |
| tree | e6b81ec95c2ec555b6f4b5a0bfc4e957cec837b2 /deploy/adapters/ansible/roles/dashboard/vars | |
| parent | 2490b7463f3a2fc86277f957945b92263495c01c (diff) | |
seperate apache2 installtion from dashboard
JIRA: COMPASS-342
Change-Id: I8ddbef46486dbd22f1324bda2d04f7a192b2148e
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/dashboard/vars')
| -rw-r--r-- | deploy/adapters/ansible/roles/dashboard/vars/Debian.yml | 9 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml | 9 |
2 files changed, 5 insertions, 13 deletions
diff --git a/deploy/adapters/ansible/roles/dashboard/vars/Debian.yml b/deploy/adapters/ansible/roles/dashboard/vars/Debian.yml index 4d9023db..5c9b032e 100644 --- a/deploy/adapters/ansible/roles/dashboard/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/dashboard/vars/Debian.yml @@ -7,15 +7,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -http_packages: - - apache2 - - libapache2-mod-wsgi - -http_service: apache2 - packages: [] services: - memcached -http_config_file: "/etc/apache2/ports.conf" +apache_config_dir: /etc/apache2 +horizon_dir: /usr/share/openstack-dashboard/openstack_dashboard diff --git a/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml b/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml index 790567f9..d213381a 100644 --- a/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml @@ -7,14 +7,11 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -http_packages: - - httpd - -http_service: httpd - packages: - mod_wsgi + - httpd -services: [] +services: + - httpd http_config_file: "/etc/httpd/conf/httpd.conf" |