equal
deleted
inserted
replaced
42 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) |
42 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) |
43 set name=openstack.upgrade-id reboot-needed=true value=$(COMPONENT_BE_VERSION) |
43 set name=openstack.upgrade-id reboot-needed=true value=$(COMPONENT_BE_VERSION) |
44 set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/054 \ |
44 set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/054 \ |
45 value=PSARC/2014/208 value=PSARC/2015/110 |
45 value=PSARC/2014/208 value=PSARC/2015/110 |
46 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) |
46 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) |
|
47 set name=variant.opensolaris.zone value=global value=nonglobal |
47 # |
48 # |
48 dir path=etc/cinder owner=cinder group=cinder mode=0700 |
49 dir path=etc/cinder owner=cinder group=cinder mode=0700 |
49 file path=etc/cinder/api-paste.ini owner=cinder group=cinder mode=0644 \ |
50 file path=etc/cinder/api-paste.ini owner=cinder group=cinder mode=0644 \ |
50 overlay=allow preserve=renamenew |
51 overlay=allow preserve=renamenew |
51 file files/cinder.conf path=etc/cinder/cinder.conf owner=cinder group=cinder \ |
52 file files/cinder.conf path=etc/cinder/cinder.conf owner=cinder group=cinder \ |
547 |
548 |
548 # force a dependency on package delivering fcinfo(1M) |
549 # force a dependency on package delivering fcinfo(1M) |
549 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/fcinfo |
550 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/fcinfo |
550 |
551 |
551 # force a dependency on package delivering itadm(1M) |
552 # force a dependency on package delivering itadm(1M) |
552 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/itadm |
553 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/itadm \ |
|
554 variant.opensolaris.zone=global |
553 |
555 |
554 # force a dependency on package delivering stmfadm(1M) |
556 # force a dependency on package delivering stmfadm(1M) |
555 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/stmfadm |
557 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/stmfadm \ |
|
558 variant.opensolaris.zone=global |
556 |
559 |
557 # force a dependency on package delivering zfs(1M) |
560 # force a dependency on package delivering zfs(1M) |
558 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/zfs |
561 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/zfs |
559 |
562 |
560 # force a dependency on babel; pkgdepend work is needed to flush this out. |
563 # force a dependency on babel; pkgdepend work is needed to flush this out. |