From aa9d825d1d6be1b9bd9611b27607735f6ae1db88 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Mon, 4 Feb 2019 18:02:21 -0500 Subject: [PATCH] Fix Fluorine installation Fix updates to features.cfg for Flourine. Change-Id: Icb8d4dc2ed98ac71a8f0ef1c8fe68729091436c5 Issue-ID: CCSDK-489 Signed-off-by: Timoney, Dan (dt5972) --- odlsli/odlsli-alpine/pom.xml | 3 +++ odlsli/odlsli-alpine/src/main/docker/Dockerfile | 5 +++-- odlsli/odlsli-ubuntu/pom.xml | 3 +++ odlsli/odlsli-ubuntu/src/main/docker/Dockerfile | 4 ++-- odlsli/src/main/resources/idmlight.db.mv.db | Bin 45056 -> 40960 bytes 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 6c9a1827..89207a96 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -31,6 +31,9 @@ deploy true 93C4A3FD7BB9C367 + odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all + ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all + ${odl.features.extra},${ccsdk.odl.features} diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index c6088b02..47b12081 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -10,6 +10,7 @@ ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.f ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features ENV ANSIBLE_GPG_KEY ${ansible.gpg.key} +ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra} # copy the opendaylight credentials COPY idmlight.db.mv.db $ODL_HOME/data @@ -21,8 +22,8 @@ RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system # Add CCSDK repositories to boot repositories RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg -RUN echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all >> $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg # Create odl user RUN adduser -S odl diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index e525be2f..488692c9 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -31,6 +31,9 @@ deploy true 93C4A3FD7BB9C367 + odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all + ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all + ${odl.features.extra},${ccsdk.odl.features} diff --git a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile index 455bdd79..fd95cba6 100644 --- a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile +++ b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile @@ -21,8 +21,8 @@ RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system # Add CCSDK repositories to boot repositories RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg -RUN echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all >> $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg # Create odl user RUN useradd odl diff --git a/odlsli/src/main/resources/idmlight.db.mv.db b/odlsli/src/main/resources/idmlight.db.mv.db index c6b359d8181513db0b28bd28f0f7b7fca8af8ed0..c0b7b4992bc438c192c6bc9e0888864946496ace 100644 GIT binary patch delta 3366 zcmcJSZA@F&8OP7L_QeD+fs~{`AebT=2$yi*eQgB6F$O~k0UU@!*F@L%UK0a;!7r4c zX>pX2t}RXnW<%d(6XH`Jt|J2_bi7_zDa zIGqVb<6$-FRk<`u`ai_xboNTCpvQ2e;@6}k-wW>Xiue^q>#LDHvAz{rM5$NTm z3f0am8u3IZ8gX*4*>#L5Lx}ndHEgmVju%8pwxeouv+YU0&vVM=p76L%dCnc592)7j zaSj<+7vmRo)h-1!O%yqaSMB^^o7d&@+726rT{UD;(0Epp>>?XfSXNQxpd7FVBwpY+ zT~JhwV|9tswSZy-gRH{JLQpq2yJql#%uii$4Bxr*^F0V*ojQPO5Uh{OU`yFxm79f4 z;{Y@b($JJtp%rM(d?MlV= z>fg%L3Z+&`)!@A+8Y*N-7nx)zY&Z=ShWk!5HK3PF7$b!4AjIs;zcYWJX_@4)iTWW} zUCq?jpQ#i!^`d_Q6;~K1i$w)ikIN%VoP(GMrda_Q4qz#P!ibfVNhc?)z?cPeez98 zbO6)RXcfh+#B!_vPmPV3&!FFw!)vkA_yc%#thvPWE9yhk0+FkAnf37&3@;6yE82Q9 z-VVR?)fZ$sP%P6n;6f2I?}9YcTnM(MDA@9Bm6C^-M0sm01Qb4t7o^W!flpqjstBtw zr@@5PC8y58?-PxW+cizdQ^DDV?foQzS+7V63N@hB9gyHY0?QO#N+2;S=2cTElI?UU zy@xKN%jpW*3agjie^?}eyj z+n%mH{UoY!^UunxME36eWU}+wpx>~LFK}bIyM|} zutDGWA{&dUK`Gv)1P%LGTp1e{Jr`KJ-8G?4kN9V!9f?$8c{Ut!yOQDL%=slYp71Bx z$V^YqXbvY^Dq+OG5j$;!2%d&-U~*qrohHzpnfO{!knJG0GMm z$tAw>$K0DbTUm3UBBF+kqoIgyEFBdIr_a!CR70?7Chp;dV?U^XUo0HNv(S0-><)h1 zUs&R?@3+InTaT4$Il1$!KE8w1ZMnrFy#7sk+0L4jj)0S6_Pi5N>sr^3Y486)9z zF!5-V+%?3E$$px#&8$dcg6dtqX`5EyjA{x8cGLRS3p=-*PWj!chg{8QFtcjbdn}YPkjSdHaCkKtA z0F6|DCg8*O^ zp^E687kj=$Ps_UnJ@cs)IaYqedgd1kZOUf+ z!M(or|9Jg8eEh;8===7*(&9$ok<;{%);_=+EHfWkG{$lUE)ZXjk^d4odw-ZpwZGE) hWnkh*1SX%oSV;dQi)wjcOl~#eS;b&>5ir-&{{@eP%W(hz literal 45056 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 JDhCw*|9`Pj((C{L -- 2.16.6