diff options
| author | prithiv <prithiv.mohan@intel.com> | 2016-09-13 11:24:53 +0100 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-14 15:41:03 +0800 |
| commit | 8a01ed32702b7c849c744b6cc593b76bdb78cab1 (patch) | |
| tree | 34fdc7722e80c95ea2dafc8dfc46bfb90ec695fc /docker | |
| parent | 1109c25b602b0517c56921d5307382f574cfb5ed (diff) | |
| download | kolla-8a01ed32702b7c849c744b6cc593b76bdb78cab1.tar.gz kolla-8a01ed32702b7c849c744b6cc593b76bdb78cab1.zip | |
Add Networking-SFC role
Networking-SFC is a neutron big-tent project support Service Function
Chaining in Neutron.
* Rename the image from neutron-networking-sfc-agent to
neutron-sfc-agent.
* Add networking-sfc role in playbooks.
Co-Authored-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Change-Id: I1f99650eed85f59929d4ab6b2226603c54f29577
Implements: blueprint enable-networking-sfc-support
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-sfc-agent/Dockerfile.j2 (renamed from docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2) | 10 | ||||
| -rw-r--r-- | docker/neutron/neutron-sfc-agent/extend_start.sh (renamed from docker/neutron/neutron-networking-sfc-agent/extend_start.sh) | 0 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 index 1582ea9a7..2c30a2242 100644 --- a/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 @@ -10,10 +10,10 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} -ADD neutron-networking-sfc-agent-archive /neutron-networking-sfc-agent-source -RUN ln -s neutron-networking-sfc-agent-source/* neutron_networking-sfc-agent \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron_networking-sfc-agent \ - && cp /neutron_networking-sfc-agent/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d \ +ADD neutron-sfc-agent-archive /neutron-sfc-agent-source +RUN ln -s neutron-sfc-agent-source/* neutron-sfc-agent \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron-sfc-agent \ + && cp /neutron-sfc-agent/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf {% endif %} @@ -21,7 +21,7 @@ RUN ln -s neutron-networking-sfc-agent-source/* neutron_networking-sfc-agent \ COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start -{% block neutron_networking_sfc_agent_footer %}{% endblock %} +{% block neutron_sfc_agent_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} diff --git a/docker/neutron/neutron-networking-sfc-agent/extend_start.sh b/docker/neutron/neutron-sfc-agent/extend_start.sh index d721b4d7b..d721b4d7b 100644 --- a/docker/neutron/neutron-networking-sfc-agent/extend_start.sh +++ b/docker/neutron/neutron-sfc-agent/extend_start.sh |