summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-05-25 00:45:41 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-25 00:45:41 +0000
commit12d4586098effd082bc3f927c1a41cbc85301285 (patch)
tree24b227c1fdc9adbef38aa5c5920880bacd39bb6e /deploy/adapters
parentd145e106f192df2772a3c73f661243530c1f5bf3 (diff)
parentb30e8e6b040efc7ad78b020277a9b93930f2f5a6 (diff)
Merge "Update for Aodh"
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml30
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/handlers/main.yml (renamed from deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml)0
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/tasks/main.yml (renamed from deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml)2
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 (renamed from deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2)0
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/api_paste.ini.j2 (renamed from deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2)0
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/policy.json.j2 (renamed from deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2)0
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/Debian.yml (renamed from deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml)0
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/RedHat.yml (renamed from deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml)0
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/vars/main.yml (renamed from deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml)0
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/ceilometer_controller/vars/Debian.yml (renamed from deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml)0
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/ceilometer_controller/vars/RedHat.yml (renamed from deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml)0
11 files changed, 1 insertions, 31 deletions
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
index 980bcac9..00000000
--- 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
index e1084c83..e1084c83 100644
--- a/deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml
+++ b/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
index aa23b9e5..75b15511 100644
--- 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
index eac6e5bd..eac6e5bd 100644
--- a/deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2
+++ b/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
index 151789c4..151789c4 100644
--- 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
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
index 4fd873e9..4fd873e9 100644
--- a/deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2
+++ b/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
index bdf4655e..bdf4655e 100644
--- a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml
+++ b/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
index 3d182880..3d182880 100644
--- a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml
+++ b/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
index b17f6ed0..b17f6ed0 100644
--- a/deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml
+++ b/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
index b749ffaa..b749ffaa 100644
--- a/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml
+++ b/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
index 6c5f53ec..6c5f53ec 100644
--- a/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/ceilometer_controller/vars/RedHat.yml