diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 13:29:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 13:29:01 +0000 |
| commit | dab1382909c512564352c78defce00667c86fc2b (patch) | |
| tree | ff5213c13987586785db0f8e533649e7fe4081e9 /docker | |
| parent | e69571eeb3729907be2ea6acb80904c4790a6916 (diff) | |
| parent | 76920be5fad2bb58680fd21681713b236bea7edf (diff) | |
| download | kolla-dab1382909c512564352c78defce00667c86fc2b.tar.gz kolla-dab1382909c512564352c78defce00667c86fc2b.zip | |
Merge "Rename ovs to openvswitch"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/openvswitch/openvswitch-base/Dockerfile.j2 (renamed from docker/openvswitch/ovs-base/Dockerfile.j2) | 0 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-db-server/Dockerfile.j2 (renamed from docker/openvswitch/ovs-db-server/Dockerfile.j2) | 2 | ||||
| -rwxr-xr-x | docker/openvswitch/openvswitch-db-server/start.sh (renamed from docker/openvswitch/ovs-db-server/start.sh) | 0 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 (renamed from docker/openvswitch/ovs-vswitchd/Dockerfile.j2) | 2 | ||||
| -rwxr-xr-x | docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh (renamed from docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh) | 0 | ||||
| -rwxr-xr-x | docker/openvswitch/openvswitch-vswitchd/start.sh (renamed from docker/openvswitch/ovs-vswitchd/start.sh) | 0 |
6 files changed, 2 insertions, 2 deletions
diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 7ededdfcd..7ededdfcd 100644 --- a/docker/openvswitch/ovs-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 diff --git a/docker/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index cca030e35..023bba83b 100644 --- a/docker/openvswitch/ovs-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/openvswitch/ovs-db-server/start.sh b/docker/openvswitch/openvswitch-db-server/start.sh index 60347b2dc..60347b2dc 100755 --- a/docker/openvswitch/ovs-db-server/start.sh +++ b/docker/openvswitch/openvswitch-db-server/start.sh diff --git a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 839da1f21..8dbd6548a 100644 --- a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh index c39d64ff7..c39d64ff7 100755 --- a/docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh +++ b/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh diff --git a/docker/openvswitch/ovs-vswitchd/start.sh b/docker/openvswitch/openvswitch-vswitchd/start.sh index b72ba5a2e..b72ba5a2e 100755 --- a/docker/openvswitch/ovs-vswitchd/start.sh +++ b/docker/openvswitch/openvswitch-vswitchd/start.sh |