X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2Ffuel-main_1.patch;fp=fuel%2Fbuild%2Ffuel-main_1.patch;h=0000000000000000000000000000000000000000;hb=19353295cc1e3bf5dff72ab48d794087767c62d7;hp=24b25b2c7d860c0766cd1d256a1a62ff33ab8d6a;hpb=5ba33388e4b4388e008d3cd5654af402e1cb7535;p=genesis.git

diff --git a/fuel/build/fuel-main_1.patch b/fuel/build/fuel-main_1.patch
deleted file mode 100644
index 24b25b2..0000000
--- a/fuel/build/fuel-main_1.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/docker/astute/Dockerfile b/docker/astute/Dockerfile
-index 55f617a..cd05f19 100644
---- a/docker/astute/Dockerfile
-+++ b/docker/astute/Dockerfile
-@@ -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
-index 0c80abd..3a3d966 100644
---- a/docker/cobbler/Dockerfile
-+++ b/docker/cobbler/Dockerfile
-@@ -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
-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
-index 43f911e..8da9108 100644
---- a/docker/ostf/Dockerfile
-+++ b/docker/ostf/Dockerfile
-@@ -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
-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
-index 201648f..4f3b67c 100644
---- a/docker/rabbitmq/Dockerfile
-+++ b/docker/rabbitmq/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 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
-index ef737bd..b6eefd1 100644
---- a/docker/rsync/Dockerfile
-+++ b/docker/rsync/Dockerfile
-@@ -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
-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