From 8a01ed32702b7c849c744b6cc593b76bdb78cab1 Mon Sep 17 00:00:00 2001
From: prithiv <prithiv.mohan@intel.com>
Date: Tue, 13 Sep 2016 11:24:53 +0100
Subject: 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
---
 .../neutron-networking-sfc-agent/Dockerfile.j2     | 28 ----------------------
 .../neutron-networking-sfc-agent/extend_start.sh   |  8 -------
 docker/neutron/neutron-sfc-agent/Dockerfile.j2     | 28 ++++++++++++++++++++++
 docker/neutron/neutron-sfc-agent/extend_start.sh   |  8 +++++++
 4 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2
 delete mode 100644 docker/neutron/neutron-networking-sfc-agent/extend_start.sh
 create mode 100644 docker/neutron/neutron-sfc-agent/Dockerfile.j2
 create mode 100644 docker/neutron/neutron-sfc-agent/extend_start.sh

(limited to 'docker')

diff --git a/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2
deleted file mode 100644
index 1582ea9a7..000000000
--- a/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-{% block neutron_networking_sfc_agent_header %}{% endblock %}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% 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 \
-    && 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 %}
-
-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 footer %}{% endblock %}
-{{ include_footer }}
-
-USER neutron
diff --git a/docker/neutron/neutron-networking-sfc-agent/extend_start.sh b/docker/neutron/neutron-networking-sfc-agent/extend_start.sh
deleted file mode 100644
index d721b4d7b..000000000
--- a/docker/neutron/neutron-networking-sfc-agent/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    neutron-db-manage --subproject networking-sfc --config-file /etc/neutron/neutron.conf upgrade head
-    exit 0
-fi
diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2
new file mode 100644
index 000000000..2c30a2242
--- /dev/null
+++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2
@@ -0,0 +1,28 @@
+FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block neutron_networking_sfc_agent_header %}{% endblock %}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif install_type == 'source' %}
+
+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 %}
+
+COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
+RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
+
+{% block neutron_sfc_agent_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+{{ include_footer }}
+
+USER neutron
diff --git a/docker/neutron/neutron-sfc-agent/extend_start.sh b/docker/neutron/neutron-sfc-agent/extend_start.sh
new file mode 100644
index 000000000..d721b4d7b
--- /dev/null
+++ b/docker/neutron/neutron-sfc-agent/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    neutron-db-manage --subproject networking-sfc --config-file /etc/neutron/neutron.conf upgrade head
+    exit 0
+fi
-- 
cgit v1.2.3