Merge "vars: Do not pull devel packages on distro installations"

vars/distro_install.yml

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ceilometer_package_list: "{{ ceilometer_service_distro_packages }}"
+ceilometer_package_list: "{{ ceilometer_distro_packages + ceilometer_service_distro_packages }}"
 
 _ceilometer_bin: "/usr/bin"

vars/redhat-7.yml

@@ -18,6 +18,8 @@ ceilometer_distro_packages:
   - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
   - rsync
+
+ceilometer_devel_distro_packages:
   - which
 
 ceilometer_service_distro_packages:

vars/source_install.yml

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ceilometer_package_list: "{{ ceilometer_distro_packages }}"
+ceilometer_package_list: "{{ ceilometer_distro_packages + ceilometer_devel_distro_packages }}"
 
 _ceilometer_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin"

vars/suse-42.yml

@@ -19,6 +19,8 @@ ceilometer_distro_packages:
   - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
   - rsync
+
+ceilometer_devel_distro_packages:
   - which
 
 ceilometer_service_distro_packages:

vars/ubuntu-16.04.yml

@@ -23,6 +23,8 @@ ceilometer_distro_packages:
   - rpcbind
   - rsync
 
+ceilometer_devel_distro_packages: []
+
 ceilometer_service_distro_packages:
   - ceilometer-agent-central
   - ceilometer-agent-compute