diff options
author | Justin chi <chigang@huawei.com> | 2015-09-23 16:46:54 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-23 16:46:54 +0000 |
commit | d16d74fbbe738f0d15366dedf9f5e042505ee1e8 (patch) | |
tree | 96f997851c91df8ced27a5bc4596287fe3d37b5f /deploy/adapters/ansible/roles/dashboard/vars | |
parent | 8e3005507e0318ec4cf9a1c158a5749c1155263e (diff) | |
parent | 5dcc94014a588e6f7bb5cb605b164609ac0b50c7 (diff) |
Merge "bug fix: using external_vip as linked dashboard ip"
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 | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/dashboard/vars/Debian.yml b/deploy/adapters/ansible/roles/dashboard/vars/Debian.yml index fee64c38..97c4af40 100644 --- a/deploy/adapters/ansible/roles/dashboard/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/dashboard/vars/Debian.yml @@ -1,8 +1,13 @@ --- -packages: +http_packages: - apache2 - libapache2-mod-wsgi +http_service: apache2 + +packages: [] + services: - - apache2 - memcached + +http_config_file: "/etc/apache2/ports.conf" diff --git a/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml b/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml index f0acce9b..5e84901c 100644 --- a/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml @@ -1,8 +1,13 @@ --- -packages: +http_packages: - httpd + +http_service: httpd + +packages: - mod_wsgi - python-memcached -services: - - httpd +services: [] + +http_config_file: "/etc/httpd/conf/httpd.conf" |