X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2Ffuel-main_1.patch;fp=fuel-build%2Ffuel-main_1.patch;h=24b25b2c7d860c0766cd1d256a1a62ff33ab8d6a;hb=6cb518c68eb136ad448e96716ef8b1348440949f;hp=a982e805421459d5d787d38bfb1d4d4af958dded;hpb=1e106bbaca2780c10bd02b4e5fa3702d36acdf39;p=genesis.git

diff --git a/fuel-build/fuel-main_1.patch b/fuel/build/fuel-main_1.patch
similarity index 99%
rename from fuel-build/fuel-main_1.patch
rename to fuel/build/fuel-main_1.patch
index a982e80..24b25b2 100644
--- a/fuel-build/fuel-main_1.patch
+++ b/fuel/build/fuel-main_1.patch
@@ -5,10 +5,10 @@ index 55f617a..cd05f19 100644
 @@ -5,7 +5,7 @@
  FROM fuel/centos
  MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
- 
+
 -RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y ruby21-nailgun-mcagents sysstat
 +RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y ruby21-nailgun-mcagents sysstat
- 
+
  ADD etc /etc
  ADD start.sh /usr/local/bin/start.sh
 diff --git a/docker/cobbler/Dockerfile b/docker/cobbler/Dockerfile
@@ -18,10 +18,10 @@ index 0c80abd..3a3d966 100644
 @@ -5,7 +5,7 @@
  FROM fuel/centos
  MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
- 
+
 -RUN rm -rf /etc/yum.repos.d/*;echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y httpd cobbler dnsmasq xinetd tftp-server; ln -s /etc/dnsmasq.conf /etc/cobbler.dnsmasq.conf
 +RUN sleep 15; rm -rf /etc/yum.repos.d/*;echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y httpd cobbler dnsmasq xinetd tftp-server; ln -s /etc/dnsmasq.conf /etc/cobbler.dnsmasq.conf
- 
+
  ADD etc /etc
  ADD start.sh /usr/local/bin/start.sh
 diff --git a/docker/mcollective/Dockerfile b/docker/mcollective/Dockerfile
@@ -29,12 +29,12 @@ index e70e87d..d6554b7 100644
 --- a/docker/mcollective/Dockerfile
 +++ b/docker/mcollective/Dockerfile
 @@ -4,7 +4,7 @@ MAINTAINER Aleksandr Didenko adidenko@mirantis.com
- 
+
  WORKDIR /root
- 
+
 -RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y sudo ruby21-mcollective
 +RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y sudo ruby21-mcollective
- 
+
  ADD etc /etc
  ADD start.sh /usr/local/bin/start.sh
 diff --git a/docker/ostf/Dockerfile b/docker/ostf/Dockerfile
@@ -44,10 +44,10 @@ index 43f911e..8da9108 100644
 @@ -5,7 +5,7 @@
  FROM fuel/centos
  MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
- 
+
 -RUN rm -rf /etc/yum.repos.d/*;echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all; yum --quiet install -y python-fuelclient supervisor postgresql-libs
 +RUN sleep 15; rm -rf /etc/yum.repos.d/*;echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all; yum --quiet install -y python-fuelclient supervisor postgresql-libs
- 
+
  ADD etc /etc
  ADD start.sh /usr/local/bin/start.sh
 diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
@@ -55,12 +55,12 @@ index b2930db..63cc4c2 100644
 --- a/docker/postgres/Dockerfile
 +++ b/docker/postgres/Dockerfile
 @@ -3,7 +3,7 @@ FROM fuel/centos
- 
+
  MAINTAINER Aleksandr Didenko adidenko@mirantis.com
- 
+
 -RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all;yum --quiet install -y sudo
 +RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all;yum --quiet install -y sudo
- 
+
  ADD etc /etc
  ADD start.sh /usr/local/bin/start.sh
 diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
@@ -70,10 +70,10 @@ index 201648f..4f3b67c 100644
 @@ -3,7 +3,7 @@
  FROM fuel/centos
  MAINTAINER Aleksandr Didenko adidenko@mirantis.com
- 
+
 -RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y rabbitmq-server
 +RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y rabbitmq-server
- 
+
  ADD etc /etc
  ADD start.sh /usr/local/bin/start.sh
 diff --git a/docker/rsync/Dockerfile b/docker/rsync/Dockerfile
@@ -83,10 +83,10 @@ index ef737bd..b6eefd1 100644
 @@ -5,7 +5,7 @@
  FROM fuel/centos
  MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
- 
+
 -RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all;yum --quiet install -y ruby21-puppet xinetd rsync logrotate
 +RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all;yum --quiet install -y ruby21-puppet xinetd rsync logrotate
- 
+
  ADD etc /etc
  ADD start.sh /usr/local/bin/start.sh
 diff --git a/docker/rsyslog/Dockerfile b/docker/rsyslog/Dockerfile
@@ -94,11 +94,11 @@ index 5efd623..8721b39 100644
 --- a/docker/rsyslog/Dockerfile
 +++ b/docker/rsyslog/Dockerfile
 @@ -2,7 +2,7 @@ FROM fuel/centos
- 
+
  MAINTAINER Aleksandr Didenko adidenko@mirantis.com
- 
+
 -RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all;yum --quiet install -y anacron rsyslog
 +RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all;yum --quiet install -y anacron rsyslog
- 
+
  ADD etc /etc
  ADD start.sh /usr/local/bin/start.sh