diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-28 11:10:17 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-28 11:10:17 +0000 |
| commit | 76920be5fad2bb58680fd21681713b236bea7edf (patch) | |
| tree | 39ff059f796f1151fa9e0275ba825c751de9a5d4 /docker/openvswitch | |
| parent | a0ac8764948f2dba28f648d053cd0a68d8c3e78d (diff) | |
| download | kolla-76920be5fad2bb58680fd21681713b236bea7edf.tar.gz kolla-76920be5fad2bb58680fd21681713b236bea7edf.zip | |
Rename ovs to openvswitch
Our openvswitch image does not follow the naming convention of any of
our other containers and it should.
Change-Id: If1b815117bb39df74061218e48778479b8d674bc
Closes-Bug: #1500392
Diffstat (limited to 'docker/openvswitch')
| -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 |