Merge "Update role for new source build process"

tasks/ceilometer_install.yml

@@ -36,20 +36,6 @@
   retries: 5
   delay: 2
 
-- name: Install distro packages required in Developer Mode
-  package:
-    name: "{{ item }}"
-    state: "{{ ceilometer_package_state }}"
-    update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
-    cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
-  register: install_packages
-  until: install_packages is success
-  retries: 5
-  delay: 2
-  with_items: "{{ ceilometer_developer_mode_distro_packages }}"
-  when:
-    - ceilometer_developer_mode | bool
-
 - name: Install the python venv
   include_role:
     name: "python_venv_build"
@@ -66,4 +52,3 @@
         option: "venv_tag"
         value: "{{ ceilometer_venv_tag }}"
   when: ceilometer_install_method == 'source'
-

tests/os_ceilometer-overrides.yml

@@ -15,7 +15,6 @@
 
 ceilometer_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
 ceilometer_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-ceilometer_developer_mode: True
 ceilometer_service_password: secrete
 ceilometer_telemetry_secret: secrete
 ceilometer_container_db_password: secrete

vars/redhat-7.yml

@@ -20,6 +20,9 @@ ceilometer_distro_packages:
 ceilometer_devel_distro_packages:
   - systemd-devel
   - which
+  - libvirt-devel
+  - libxml2-devel
+  - libxslt-devel
 
 ceilometer_service_distro_packages:
   - openstack-ceilometer-central
@@ -29,12 +32,6 @@ ceilometer_service_distro_packages:
   - openstack-ceilometer-polling
   - systemd-python
 
-# Packages required in developer mode, where packages are built locally
-ceilometer_developer_mode_distro_packages:
-  - libvirt-devel
-  - libxml2-devel
-  - libxslt-devel
-
 ceilometer_oslomsg_amqp1_distro_packages:
   - cyrus-sasl-lib
   - cyrus-sasl-plain

vars/suse.yml

@@ -22,6 +22,9 @@ ceilometer_devel_distro_packages:
   - pkg-config
   - systemd-devel
   - which
+  - libvirt-devel
+  - libxml2-devel
+  - libxslt-devel
 
 ceilometer_service_distro_packages:
   - openstack-ceilometer
@@ -32,12 +35,6 @@ ceilometer_service_distro_packages:
   - openstack-ceilometer-polling
   - python-systemd
 
-# Packages required in developer mode, where packages are built locally
-ceilometer_developer_mode_distro_packages:
-  - libvirt-devel
-  - libxml2-devel
-  - libxslt-devel
-
 ceilometer_oslomsg_amqp1_distro_packages:
   - cyrus-sasl
   - cyrus-sasl-plain

vars/ubuntu.yml

@@ -22,7 +22,11 @@ ceilometer_distro_packages:
   - python-libvirt
   - python3-libvirt
 
-ceilometer_devel_distro_packages: []
+ceilometer_devel_distro_packages:
+  - libvirt-dev
+  - libxml2-dev
+  - libxslt1-dev
+  - pkg-config
 
 ceilometer_service_distro_packages:
   - ceilometer-agent-central
@@ -32,13 +36,6 @@ ceilometer_service_distro_packages:
   - python-systemd
   - python3-systemd
 
-# Packages required in developer mode, where packages are built locally
-ceilometer_developer_mode_distro_packages:
-  - libvirt-dev
-  - libxml2-dev
-  - libxslt1-dev
-  - pkg-config
-
 ceilometer_oslomsg_amqp1_distro_packages:
   - libsasl2-modules
   - sasl2-bin