Merge "Add Mitaka package for Ubuntu 14.04"

14 files changed, 103 insertions, 7 deletions

diff --git a/deploy/adapters/ansible/openstack_mitaka/.gitkeep b/deploy/adapters/ansible/openstack_mitaka/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka/.gitkeep
diff --git a/deploy/adapters/ansible/roles/aodh/handlers/main.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml
index e1084c83..e1084c83 100644
--- a/deploy/adapters/ansible/roles/aodh/handlers/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/aodh/handlers/main.yml
diff --git a/deploy/adapters/ansible/roles/aodh/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml
index aa23b9e5..aa23b9e5 100644
--- a/deploy/adapters/ansible/roles/aodh/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/aodh/tasks/main.yml
diff --git a/deploy/adapters/ansible/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2
index eac6e5bd..eac6e5bd 100644
--- a/deploy/adapters/ansible/roles/aodh/templates/aodh.conf.j2
+++ b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/aodh.conf.j2
diff --git a/deploy/adapters/ansible/roles/aodh/templates/api_paste.ini.j2 b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2
index 151789c4..151789c4 100644
--- a/deploy/adapters/ansible/roles/aodh/templates/api_paste.ini.j2
+++ b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/api_paste.ini.j2
diff --git a/deploy/adapters/ansible/roles/aodh/templates/policy.json.j2 b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2
index 4fd873e9..4fd873e9 100644
--- a/deploy/adapters/ansible/roles/aodh/templates/policy.json.j2
+++ b/deploy/adapters/ansible/openstack_mitaka/aodh/templates/policy.json.j2
diff --git a/deploy/adapters/ansible/roles/aodh/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml
index bdf4655e..bdf4655e 100644
--- a/deploy/adapters/ansible/roles/aodh/vars/Debian.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/Debian.yml
diff --git a/deploy/adapters/ansible/roles/aodh/vars/RedHat.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml
index 3d182880..3d182880 100644
--- a/deploy/adapters/ansible/roles/aodh/vars/RedHat.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/RedHat.yml
diff --git a/deploy/adapters/ansible/roles/aodh/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml
index b17f6ed0..b17f6ed0 100644
--- a/deploy/adapters/ansible/roles/aodh/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/aodh/vars/main.yml
diff --git a/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml
new file mode 100644
index 00000000..b749ffaa
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/Debian.yml
@@ -0,0 +1,37 @@
+##############################################################################
+# 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
+##############################################################################
+---
+ceilometer_packages:
+  - ceilometer-api
+  - ceilometer-collector
+  - ceilometer-agent-central
+  - ceilometer-agent-notification
+#  - ceilometer-alarm-evaluator
+#  - ceilometer-alarm-notifier
+  - python-ceilometerclient
+
+ceilometer_services:
+  - ceilometer-agent-central
+  - ceilometer-agent-notification
+  - ceilometer-api
+  - ceilometer-collector
+#  - ceilometer-alarm-evaluator
+#  - ceilometer-alarm-notifier
+
+ceilometer_configs_templates:
+  - src: ceilometer.j2
+    dest:
+      - /etc/ceilometer/ceilometer.conf
+  - src: cinder.j2
+    dest:
+      - /etc/cinder/cinder.conf
+  - src: glance.j2
+    dest:
+      - /etc/glance/glance-api.conf
+      - /etc/glance/glance-registry.conf
diff --git a/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml b/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml
new file mode 100644
index 00000000..6c5f53ec
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka/ceilometer_controller/vars/RedHat.yml
@@ -0,0 +1,36 @@
+##############################################################################
+# 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
+##############################################################################
+---
+ceilometer_packages:
+  - openstack-ceilometer-api
+  - openstack-ceilometer-collector
+  - openstack-ceilometer-central
+  - openstack-ceilometer-notification
+#  - openstack-ceilometer-alarm
+  - python-ceilometerclient
+
+ceilometer_services:
+  - openstack-ceilometer-central
+  - openstack-ceilometer-notification
+  - openstack-ceilometer-api
+  - openstack-ceilometer-collector
+#  - openstack-ceilometer-alarm-evaluator
+#  - openstack-ceilometer-alarm-notifier
+
+ceilometer_configs_templates:
+  - src: ceilometer.j2
+    dest:
+      - /etc/ceilometer/ceilometer.conf
+  - src: cinder.j2
+    dest:
+      - /etc/cinder/cinder.conf
+  - src: glance.j2
+    dest:
+      - /etc/glance/glance-api.conf
+      - /etc/glance/glance-registry.conf
diff --git a/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml
new file mode 100644
index 00000000..980bcac9
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka/common/vars/Debian.yml
@@ -0,0 +1,30 @@
+##############################################################################
+# 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/roles/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
index 6615317d..55f5aa19 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
@@ -12,8 +12,6 @@ ceilometer_packages:
   - ceilometer-collector
   - ceilometer-agent-central
   - ceilometer-agent-notification
-  - ceilometer-alarm-evaluator
-  - ceilometer-alarm-notifier
   - python-ceilometerclient
 
 ceilometer_services:
@@ -21,8 +19,6 @@ ceilometer_services:
   - ceilometer-agent-notification
   - ceilometer-api
   - ceilometer-collector
-  - ceilometer-alarm-evaluator
-  - ceilometer-alarm-notifier
 
 ceilometer_configs_templates:
   - src: ceilometer.j2
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml b/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml
index f1eb4e5b..86f464a5 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/vars/RedHat.yml
@@ -12,7 +12,6 @@ ceilometer_packages:
   - openstack-ceilometer-collector
   - openstack-ceilometer-central
   - openstack-ceilometer-notification
-  - openstack-ceilometer-alarm
   - python-ceilometerclient
 
 ceilometer_services:
@@ -20,8 +19,6 @@ ceilometer_services:
   - openstack-ceilometer-notification
   - openstack-ceilometer-api
   - openstack-ceilometer-collector
-  - openstack-ceilometer-alarm-evaluator
-  - openstack-ceilometer-alarm-notifier
 
 ceilometer_configs_templates:
   - src: ceilometer.j2