aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-09-28 11:10:17 +0000
committerSam Yaple <sam@yaple.net>2015-09-28 11:10:17 +0000
commit76920be5fad2bb58680fd21681713b236bea7edf (patch)
tree39ff059f796f1151fa9e0275ba825c751de9a5d4 /ansible
parenta0ac8764948f2dba28f648d053cd0a68d8c3e78d (diff)
downloadkolla-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 'ansible')
-rw-r--r--ansible/roles/neutron/defaults/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index e05869c38..9bb9939f2 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -28,11 +28,11 @@ neutron_linuxbridge_agent_image: "{{ docker_registry ~ '/' if docker_registry el
neutron_linuxbridge_agent_tag: "{{ openstack_release }}"
neutron_linuxbridge_agent_image_full: "{{ neutron_linuxbridge_agent_image }}:{{ neutron_linuxbridge_agent_tag }}"
-openvswitch_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ovs-vswitchd"
+openvswitch_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-openvswitch-vswitchd"
openvswitch_vswitchd_tag: "{{ openstack_release }}"
openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitch_vswitchd_tag }}"
-openvswitch_db_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ovs-db-server"
+openvswitch_db_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-openvswitch-db-server"
openvswitch_db_tag: "{{ openstack_release }}"
openvswitch_db_image_full: "{{ openvswitch_db_image }}:{{ openvswitch_db_tag }}"