Refactor module
Change-Id: Ic290c444a881559da57f4c42a2f033c6fef7c805
diff --git a/baremetal_simulator/init.sls b/baremetal_simulator/init.sls
index ec8abbe..1cfdfa4 100644
--- a/baremetal_simulator/init.sls
+++ b/baremetal_simulator/init.sls
@@ -9,7 +9,7 @@
pip.installed:
- names: {{ baremetal_simulator.pip_pkgs }}
- require:
- - pkg: python-pip
+ - simulator_pkgs
libvirt-bin:
service.running:
@@ -30,28 +30,6 @@
file.directory:
- makedirs: true
-deploy_ramdisk:
- file.managed:
- - name: {{ baremetal_simulator.http_root }}/{{ baremetal_simulator.deploy_ramdisk_file }}
- - source: {{ baremetal_simulator.deploy_ramdisk_ref }}
- - skip_verify: true
-
-deploy_kernel:
- file.managed:
- - name: {{ baremetal_simulator.http_root }}/{{ baremetal_simulator.deploy_kernel_file }}
- - source: {{ baremetal_simulator.deploy_kernel_ref }}
- - skip_verify: true
-
-{%- if baremetal_simulator.cirros_image_ref is defined %}
-
-{{ baremetal_simulator.cirros_image_name }}_file:
- file.managed:
- - name: {{ baremetal_simulator.http_root }}/{{ baremetal_simulator.cirros_image_name }}
- - source: {{ baremetal_simulator.cirros_image_ref }}
- - skip_verify: true
-
-{%- endif %}
-
{%- for identity_name, nodes in bs_nodes.iteritems() %}
{%- for node in nodes %}
diff --git a/baremetal_simulator/map.jinja b/baremetal_simulator/map.jinja
index 1ef3600..f3e7993 100644
--- a/baremetal_simulator/map.jinja
+++ b/baremetal_simulator/map.jinja
@@ -1,6 +1,6 @@
{% set baremetal_simulator = salt['grains.filter_by']({
'Common': {
- 'pkgs': ['python-pip', 'openvswitch-switch', 'libvirt-bin'],
+ 'pkgs': ['python-pip', 'openvswitch-switch', 'python-libvirt', 'libvirt-bin', 'pkg-config'],
'pip_pkgs': ['virtualbmc'],
}
}, base='Common', merge=pillar.get('baremetal_simulator', {})) %}
diff --git a/metadata/service/network/lb.yml b/metadata/service/network/lb.yml
new file mode 100644
index 0000000..e4f40f0
--- /dev/null
+++ b/metadata/service/network/lb.yml
@@ -0,0 +1,12 @@
+parameters:
+ linux:
+ network:
+ interface:
+ brsm-brbm:
+ enabled: true
+ type: ovs_port
+ port_type: internal
+ bridge: br-simulator
+ br-baremetal:
+ use_ovs_ports:
+ - brsm-brbm
diff --git a/metadata/service/network/ovs.yml b/metadata/service/network/ovs.yml
new file mode 100644
index 0000000..94fe404
--- /dev/null
+++ b/metadata/service/network/ovs.yml
@@ -0,0 +1,16 @@
+parameters:
+ linux:
+ network:
+ interface:
+ brsm-brbm:
+ enabled: true
+ type: ovs_port
+ port_type: patch
+ bridge: br-simulator
+ peer: brbm-brsm
+ brbm-brsm:
+ enabled: true
+ type: ovs_port
+ port_type: patch
+ bridge: br-baremetal
+ peer: brsm-brbm
diff --git a/metadata/service/simulator.yml b/metadata/service/simulator.yml
index 3dd12fd..836ef27 100644
--- a/metadata/service/simulator.yml
+++ b/metadata/service/simulator.yml
@@ -5,20 +5,33 @@
enabled: true
http_root: /var/www/httproot
deploy_ramdisk_file: tinyipa-stable-newton.gz
+ deploy_ramdisk_md5summ: 1efc7b5160e031f771125a700e687013
deploy_kernel_file: tinyipa-stable-newton.vmlinuz
+ deploy_kernel_md5summ: 8bffc2d4ca84e7b6d1310fef7b8c6ddc
deploy_ramdisk_ref: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/${baremetal_simulator:deploy_ramdisk_file}
deploy_kernel_ref: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/${baremetal_simulator:deploy_kernel_file}
cirros_image_name: cirros-0.3.5-x86_64-disk.img
cirros_image_ref: http://download.cirros-cloud.net/0.3.5/${baremetal_simulator:cirros_image_name}
- cirros_image_checksum: f8ab98ff5e73ebab884d80c9dc9c7290
+ cirros_image_md5summ: f8ab98ff5e73ebab884d80c9dc9c7290
ironic:
+ conductor:
+ http_images:
+ - name: ${baremetal_simulator:deploy_ramdisk_file}
+ source: ${baremetal_simulator:deploy_ramdisk_ref}
+ md5summ: ${baremetal_simulator:deploy_ramdisk_md5summ}
+ - name: ${baremetal_simulator:deploy_kernel_file}
+ source: ${baremetal_simulator:deploy_kernel_ref}
+ md5summ: ${baremetal_simulator:deploy_kernel_md5summ}
+ - name: ${baremetal_simulator:cirros_image_name}
+ source: ${baremetal_simulator:cirros_image_ref}
+ md5summ: ${baremetal_simulator:cirros_image_md5summ}
client:
enabled: true
deployment_profiles:
infra:
instance_info:
- image_source: http://${_param:single_address}/${baremetal_simulator:cirros_image_name}
- image_checksum: ${baremetal_simulator:cirros_image_checksum}
+ image_source: http://${_param:single_baremetal_address}/${baremetal_simulator:cirros_image_name}
+ image_checksum: ${baremetal_simulator:cirros_image_md5summ}
root_gb: 10
metadata:
instance:
@@ -29,35 +42,37 @@
name: baremetal-flat-network
nodes:
admin_identity:
- - name: n0
- driver: agent_ipmitool
+ - name: ${linux:network:hostname}-n0
+ driver: pxe_ipmitool
properties:
local_gb: 10
cpus: 2
memory_mb: 1024
+ cpu_arch: x86_64
driver_info:
ipmi_username: admin
ipmi_password: password
- ipmi_address: ${_param:single_address}
+ ipmi_address: ${_param:single_baremetal_address}
ipmi_port: 6200
- deploy_ramdisk: http://${_param:single_address}/${baremetal_simulator:deploy_ramdisk_file}
- deploy_kernel: http://${_param:single_address}/${baremetal_simulator:deploy_kernel_file}
+ deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+ deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
ports:
- address: aa:bb:cc:dd:00:00
- address: aa:bb:cc:dd:00:01
- - name: n1
- driver: agent_ipmitool
+ - name: ${linux:network:hostname}-n1
+ driver: pxe_ipmitool
properties:
local_gb: 10
cpus: 2
memory_mb: 1024
+ cpu_arch: x86_64
driver_info:
ipmi_username: admin
ipmi_password: password
- ipmi_address: ${_param:single_address}
+ ipmi_address: ${_param:single_baremetal_address}
ipmi_port: 6201
- deploy_ramdisk: http://${_param:single_address}/${baremetal_simulator:deploy_ramdisk_file}
- deploy_kernel: http://${_param:single_address}/${baremetal_simulator:deploy_kernel_file}
+ deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+ deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
ports:
- address: aa:bb:cc:dd:01:00
deployment_profile:
@@ -65,36 +80,26 @@
fixed_ips:
- ip_address: 192.168.90.111
subnet_name: baremetal-subnet
- - name: n2
- driver: agent_ipmitool
+ - name: ${linux:network:hostname}-n2
+ driver: pxe_ipmitool
properties:
local_gb: 10
cpus: 2
memory_mb: 1024
+ cpu_arch: x86_64
driver_info:
ipmi_username: admin
ipmi_password: password
- ipmi_address: ${_param:single_address}
+ ipmi_address: ${_param:single_baremetal_address}
ipmi_port: 6202
- deploy_ramdisk: http://${_param:single_address}/${baremetal_simulator:deploy_ramdisk_file}
- deploy_kernel: http://${_param:single_address}/${baremetal_simulator:deploy_kernel_file}
+ deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+ deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
ports:
- address: aa:bb:cc:dd:02:00
linux:
network:
+ bridge: openvswitch
interface:
br-simulator:
enabled: true
type: ovs_bridge
- brsm-brbm:
- enabled: true
- type: ovs_port
- port_type: patch
- bridge: br-simulator
- peer: brbm-brsm
- brbm-brsm:
- enabled: true
- type: ovs_port
- port_type: patch
- bridge: br-baremetal
- peer: brsm-brbm