openstack/instack-undercloud
Code Issues Proposed changes

Use os-apply-config to create files under /etc/edeploy

Browse Source
This commit is contained in:
James Slagle 2015-01-22 06:35:18 -05:00
parent 233fc495c9
commit 7823d65bbb
4 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/ironic-discoverd/os-apply-config/etc/edeploy/compute.specs Normal file
View File

@ -0,0 +1,5 @@
[
('disk', '$disk', 'size', 'gt(4)'),
('network', '$eth', 'ipv4', 'network(192.0.2.0/24)'),
('memory', 'total', 'size', 'ge(4294967296)'),
]

5
elements/ironic-discoverd/os-apply-config/etc/edeploy/control.specs Normal file
View File

@ -0,0 +1,5 @@
[
('disk', '$disk', 'size', 'gt(4)'),
('network', '$eth', 'ipv4', 'network(192.0.2.0/24)'),
('memory', 'total', 'size', 'ge(2147483648)'),
]

1
elements/ironic-discoverd/os-apply-config/etc/edeploy/state Normal file
View File

@ -0,0 +1 @@
[('compute', '*'), ('control', '1')]

22
elements/ironic-discoverd/os-refresh-config/post-configure.d/99-restart-discovery
View File

@ -8,27 +8,5 @@ set -eux
os-svc-enable -n openstack-ironic-discoverd-dnsmasq os-svc-enable -n openstack-ironic-discoverd-dnsmasq
os-svc-enable -n openstack-ironic-discoverd os-svc-enable -n openstack-ironic-discoverd
mkdir -p /etc/edeploy/
cat > /etc/edeploy/state <<EOF
[('compute', '*'), ('control', '1')]
EOF
cat > /etc/edeploy/compute.specs <<EOF
[
('disk', '\$disk', 'size', 'gt(4)'),
('network', '\$eth', 'ipv4', 'network(192.0.2.0/24)'),
('memory', 'total', 'size', 'ge(4294967296)'),
]
EOF
cat > /etc/edeploy/control.specs <<EOF
[
('disk', '\$disk', 'size', 'gt(4)'),
('network', '\$eth', 'ipv4', 'network(192.0.2.0/24)'),
('memory', 'total', 'size', 'ge(2147483648)'),
]
EOF
os-svc-restart -n openstack-ironic-discoverd-dnsmasq os-svc-restart -n openstack-ironic-discoverd-dnsmasq
os-svc-restart -n openstack-ironic-discoverd os-svc-restart -n openstack-ironic-discoverd