Update for Aodh

JIRA: COMPASS-395

Change-Id: I24e2f1229622d5bf230193145c1e6c3bf1d7377b
Signed-off-by: Yifei Xue <xueyifei@huawei.com>

diff --git a/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml
deleted file mode 100644 (file)
index 980bcac..0000000
--- a/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD 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
-##############################################################################
----
-packages:
-  - ubuntu-cloud-keyring
-  #- python-dev
-  - openvswitch-datapath-dkms
-  - openvswitch-switch
-  - python-memcache
-  - python-iniparse
-  - python-lxml
-#  - python-d* #TODO, need remove
-
-pip_packages:
-  - crudini
-  - python-keyczar
-  - yang2tosca
-
-pip_conf: pip.conf
-
-services:
-  - ntp
-
-

diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/handlers/main.yml
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml
rename to deploy/adapters/ansible/openstack_mitaka/roles/aodh/handlers/main.yml

diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/tasks/main.yml
similarity index 94%
rename from deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml
rename to deploy/adapters/ansible/openstack_mitaka/roles/aodh/tasks/main.yml
index aa23b9e..75b1551 100644 (file)
--- a/deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/tasks/main.yml
@@ -14,7 +14,7 @@
   with_items: packages | union(packages_noarch)
 
 - name: update aodh conf
-  template: src={{ item }} dest=/etc/aodh/{{ item }}
+  template: src={{ item }} dest=/etc/aodh/aodh.conf
             backup=yes
   with_items:
     - aodh.conf.j2

diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2
rename to deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2

diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2 b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/api_paste.ini.j2
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2
rename to deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/api_paste.ini.j2

diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2 b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/policy.json.j2
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2
rename to deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/policy.json.j2

diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/Debian.yml
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml
rename to deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/Debian.yml

diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/RedHat.yml
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml
rename to deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/RedHat.yml

diff --git a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/main.yml
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml
rename to deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/main.yml

diff --git a/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/roles/ceilometer_controller/vars/Debian.yml
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml
rename to deploy/adapters/ansible/openstack_mitaka/roles/ceilometer_controller/vars/Debian.yml

diff --git a/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml b/deploy/adapters/ansible/openstack_mitaka/roles/ceilometer_controller/vars/RedHat.yml
similarity index 100%
rename from deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml
rename to deploy/adapters/ansible/openstack_mitaka/roles/ceilometer_controller/vars/RedHat.yml