From 6d6ca4339375cc6c1ca7233c033bb7e7449a77a1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH] Remove trailing spaces in file xCAT-OpenStack-ironic/ironic_baremetal/README.rst --- xCAT-OpenStack-ironic/ironic_baremetal/README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/README.rst b/xCAT-OpenStack-ironic/ironic_baremetal/README.rst index 9fad8f287..c05b91b2a 100644 --- a/xCAT-OpenStack-ironic/ironic_baremetal/README.rst +++ b/xCAT-OpenStack-ironic/ironic_baremetal/README.rst @@ -13,12 +13,12 @@ Ironic is a project in Openstack, it will replace the nova-baremetal in juno rel without change any code in Openstack. Ironic xCAT driver takes the advantage of xcat and openstack, we can use it to deploy the baremetal machine very easily. Before using this driver, we must setup the openstack environment at least for two nodes( ironic conductor and neutron network node can't setup on the same node) -Ironic conductor and the baremetal node( waiting for deploy) must in the same vlan +Ironic conductor and the baremetal node( waiting for deploy) must in the same vlan -Add the follows in the ironic egg-info entry_points.txt file (ironic.drivers section) +Add the follows in the ironic egg-info entry_points.txt file (ironic.drivers section) pxe_xcat = ironic.drivers.xcat:XCATBaremetalDriver - + When the openstack with ironic is ready, just execute command in the ironic_xcat directory as follows: $ python setup.py install @@ -29,10 +29,10 @@ Initialize the xcat environment according to http://sourceforge.net/p/xcat/wiki Using xCAT baremetal driver need config site table and run copycds to generate image. The node definition is not requirement. Ironic use neutron as the network service. -Check the openvswitch config on the network node ,make sure brbm bridge connect to the baremetal node. +Check the openvswitch config on the network node ,make sure brbm bridge connect to the baremetal node. ================================================================================== -Some Example to use the xCAT baremetal driver. +Some Example to use the xCAT baremetal driver. $touch /tmp/rhelhpc6.5-x86_64-install-compute.qcow2;glance image-create --name rhelhpc6.5-x86_64-install-compute --public --disk-format qcow2 --container-format bare --property xcat_image_name='rhels6.4-x86_64-install-compute' < /tmp/rhelhpc6.5-x86_64-install-compute.qcow2 --name rhelhpc6.5-x86_64-install-compute is the image name in xcat. You can use lsdef -t osimage on the ironic-conductor node which xcat is installed.