Browse code

Update for openshift-sdn script installation changes

Dan Winship authored on 2015/12/16 01:54:23
Showing 2 changed files
... ...
@@ -15,7 +15,7 @@ os::provision::install-sdn() {
15 15
   mkdir -p "${target}/bin/"
16 16
   pushd "${osdn_plugin_path}" > /dev/null
17 17
     cp -f ovs/bin/openshift-sdn-ovs "${target}/bin/"
18
-    cp -f ovs/bin/openshift-sdn-ovs-setup.sh "${target}/bin/"
18
+    cp -f ovs/bin/openshift-sdn-docker-setup.sh "${target}/bin/"
19 19
   popd > /dev/null
20 20
 
21 21
   # osdn plugin setup writes docker network options to
... ...
@@ -282,7 +282,7 @@ install -d -m 0755 %{buildroot}%{_unitdir}/docker.service.d
282 282
 install -p -m 0644 contrib/systemd/docker-sdn-ovs.conf %{buildroot}%{_unitdir}/docker.service.d/
283 283
 pushd _thirdpartyhacks/src/%{sdn_import_path}/plugins/osdn/ovs/bin
284 284
    install -p -m 755 openshift-sdn-ovs %{buildroot}%{_bindir}/openshift-sdn-ovs
285
-   install -p -m 755 openshift-sdn-ovs-setup.sh %{buildroot}%{_bindir}/openshift-sdn-ovs-setup.sh
285
+   install -p -m 755 openshift-sdn-docker-setup.sh %{buildroot}%{_bindir}/openshift-sdn-docker-setup.sh
286 286
 popd
287 287
 install -d -m 0755 %{buildroot}%{_unitdir}/%{name}-node.service.d
288 288
 install -p -m 0644 contrib/systemd/openshift-sdn-ovs.conf %{buildroot}%{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf
... ...
@@ -405,7 +405,7 @@ fi
405 405
 %dir %{_unitdir}/docker.service.d/
406 406
 %dir %{_unitdir}/%{name}-node.service.d/
407 407
 %{_bindir}/openshift-sdn-ovs
408
-%{_bindir}/openshift-sdn-ovs-setup.sh
408
+%{_bindir}/openshift-sdn-docker-setup.sh
409 409
 %{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf
410 410
 %{_unitdir}/docker.service.d/docker-sdn-ovs.conf
411 411