diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-26 05:51:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-26 05:51:38 +0000 |
| commit | 617fc1097c01fcb8d2f1734ca538bac1c87d504d (patch) | |
| tree | 842c5cf46a6e82148e26d38d23a75a5e66dc14b7 /docker/neutron | |
| parent | 8d12ee76ab5e7159b5e1d6ecb4e0cbf017924e40 (diff) | |
| parent | fb300581226f75d2f13c282d41a4e4011972ffa0 (diff) | |
| download | kolla-617fc1097c01fcb8d2f1734ca538bac1c87d504d.tar.gz kolla-617fc1097c01fcb8d2f1734ca538bac1c87d504d.zip | |
Merge "Remove l3_ovs_wip tag from Dockerfiles"
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/agents/dhcp/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/neutron/agents/l3/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/neutron/agents/linux-bridge/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/neutron/agents/metadata/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/neutron/agents/dhcp/Dockerfile b/docker/neutron/agents/dhcp/Dockerfile index 6ce7852b1..082dfd939 100644 --- a/docker/neutron/agents/dhcp/Dockerfile +++ b/docker/neutron/agents/dhcp/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages diff --git a/docker/neutron/agents/l3/Dockerfile b/docker/neutron/agents/l3/Dockerfile index 9edb81361..4ff41c1bf 100644 --- a/docker/neutron/agents/l3/Dockerfile +++ b/docker/neutron/agents/l3/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages diff --git a/docker/neutron/agents/linux-bridge/Dockerfile b/docker/neutron/agents/linux-bridge/Dockerfile index c2b60c9a9..0a8a9cbff 100644 --- a/docker/neutron/agents/linux-bridge/Dockerfile +++ b/docker/neutron/agents/linux-bridge/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages diff --git a/docker/neutron/agents/metadata/Dockerfile b/docker/neutron/agents/metadata/Dockerfile index 9edb81361..4ff41c1bf 100644 --- a/docker/neutron/agents/metadata/Dockerfile +++ b/docker/neutron/agents/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/neutron/neutron-base/Dockerfile index bf5618817..33bcc371f 100644 --- a/docker/neutron/neutron-base/Dockerfile +++ b/docker/neutron/neutron-base/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-neutron-ml2 ; yum clean all diff --git a/docker/neutron/neutron-server/Dockerfile b/docker/neutron/neutron-server/Dockerfile index 6c3025e0c..02e2e809f 100644 --- a/docker/neutron/neutron-server/Dockerfile +++ b/docker/neutron/neutron-server/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) #Install required packages |