On Tue, Jun 18, 2013 at 2:59 PM, Alena Prokharchyk < alena.prokharc...@citrix.com> wrote:
> On 6/18/13 2:44 PM, "Sheng Yang" <sh...@yasker.org> wrote: > > >It seems no change has been done for db upgrade part(no reverting I > >meant). > > > >If it's incorrect someone please pointed out. > > 1) Check if these parameters are being inserted as a part of the upgrade > to 4.2: > > "external,baremetal.resource.classname" > "external.baremetal.system.url" > Frank didn't add this part, I would add it. > > > > Also would be good to replace "," with "." in the global config name > > 2) Check if the foreign keys below exist on fresh as well as upgraded > setups: > > baremetal_dhcp_devices > > `fk_external_dhcp_devices_nsp_id` > `fk_external_dhcp_devices_host_id` > `fk_external_dhcp_devices_pod_id` > `fk_external_dhcp_devices_physical_network_id` > > > > baremetal_pxe_devices > > `fk_external_pxe_devices_nsp_id` > `fk_external_pxe_devices_pod_id` > `fk_external_pxe_devices_host_id` > `fk_external_pxe_devices_physical_network_id` > Where are these foreign keys? I cannot find them in code. --Sheng > > > > -alena. > > > > > >--Sheng > > > > > >On Tue, Jun 18, 2013 at 2:29 PM, Alena Prokharchyk < > >alena.prokharc...@citrix.com> wrote: > > > >> Sheng, can you also check if all the DB upgrade related changes are > >>merged > >> back in as well? In case they were dropped at some point. > >> > >> -Alena. > >> > >> On 6/18/13 1:53 PM, "Sheng Yang" <sh...@yasker.org> wrote: > >> > >> >Hi, > >> > > >> >Due to absent of Frank, I've tried to make sure Baremetal wouldn't miss > >> >4.2. So for the last a few days work, I am able to re-enable baremetal > >>for > >> >master. > >> > > >> >It turn out the change is not big, and most of it just compose of > >>revert > >> >of > >> >previous change, and I fixed some issues brought by the new features. > >> > > >> >The total change summary is: > >> > > >> >-- > >> > client/pom.xml > >> > | 5 +++++ > >> > client/tomcatconf/applicationContext.xml.in > >> > | 4 ---- > >> > client/tomcatconf/componentContext.xml.in > >> > | 10 ---------- > >> > client/tomcatconf/nonossComponentContext.xml.in > >> > | 8 -------- > >> > > >> > >>>plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalD > >>>is > >> >coverer.java > >> > | 3 ++- > >> > > >> > >>>plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalT > >>>em > >> >plateAdapter.java > >> > | 6 ------ > >> > > >> > >>>plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/Bar > >>>em > >> >etalDhcpElement.java > >> >| 6 ++++-- > >> > plugins/network-elements/dns-notifier/resources/components-example.xml > >> > | 8 -------- > >> > server/src/com/cloud/network/NetworkServiceImpl.java > >> > | 9 +++------ > >> > 9 files changed, 14 insertions(+), 45 deletions(-) > >> > > >> > > >> >I've tested against the original blocker issues: > >> >https://issues.apache.org/jira/browse/CLOUDSTACK-1610 > >> >https://issues.apache.org/jira/browse/CLOUDSTACK-1618 > >> >https://issues.apache.org/jira/browse/CLOUDSTACK-1614 > >> >https://issues.apache.org/jira/browse/CLOUDSTACK-1440 > >> > > >> >They all passed. > >> > > >> >Can I say we're ready to re-enable the baremetal in master now? > >> > > >> >--Sheng > >> > > >> > >> > >> > > > > >