Switch to vbmc installed from apt repo
This patch changes the way virtualbmc is installed - use
apt instead of pip
Change-Id: I486c0e824006c90fd49679f7f7031a8fa7cc7fed
Related-PROD: PROD-28861
diff --git a/baremetal_simulator/init.sls b/baremetal_simulator/init.sls
index e81b87f..84f6397 100644
--- a/baremetal_simulator/init.sls
+++ b/baremetal_simulator/init.sls
@@ -5,21 +5,6 @@
pkg.installed:
- names: {{ baremetal_simulator.pkgs }}
-simulator_pip_pkgs:
- pip.installed:
- - names: {{ baremetal_simulator.pip_pkgs }}
- - require:
- - simulator_pkgs
-
-{# This step is required for vbmc 1.4.0 - it spawns itself during first run and starts listening on default port 50891 #}
-{# For older versions (or during next executions) it will just print list of domains #}
-start_vbmc:
- module.run:
- - name: cmd.run_bg
- - cmd: "/usr/bin/python /usr/local/bin/vbmc list"
- - require:
- - pip: simulator_pip_pkgs
-
{%- if baremetal_simulator.get('tor', {}).get('enabled', False) %}
openvswitch-vtep-pkg:
@@ -128,7 +113,7 @@
- name: vbmc add {{ node.name }} --port {{ node.driver_info.ipmi_port }}
- unless: "vbmc show {{ node.name }}"
- require:
- - module: start_vbmc
+ - pkg: simulator_pkgs
vbmc_start_{{ node.name }}:
cmd.run:
diff --git a/baremetal_simulator/map.jinja b/baremetal_simulator/map.jinja
index c9bdb85..e791831 100644
--- a/baremetal_simulator/map.jinja
+++ b/baremetal_simulator/map.jinja
@@ -1,8 +1,7 @@
{% set baremetal_simulator = salt['grains.filter_by']({
'Common': {
'pkgs': ['qemu', 'qemu-kvm', 'python-pip', 'openvswitch-switch',
- 'python-libvirt', 'libvirt-bin', 'pkg-config'],
- 'pip_pkgs': ['virtualbmc'],
+ 'python-libvirt', 'libvirt-bin', 'pkg-config', 'python-virtualbmc'],
}
}, base='Common', merge=pillar.get('baremetal_simulator', {})) %}