File project.diff of Package openstack-octavia

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package openstack-octavia (Revision 3e1b82bbb464fa7de0b9c8fd1550bc07)

Currently displaying revision 3e1b82bbb464fa7de0b9c8fd1550bc07 , Show latest

--- 0001-Update-osutil-support-for-SUSE-distro.patch.orig
+++ 0001-Update-osutil-support-for-SUSE-distro.patch
@@ -1,24 +1,30 @@
-From 9f6804ac216ee3c639ef8017f8937896c7fa687a Mon Sep 17 00:00:00 2001
+From 418139e5c967e9e1bd8ef0b914699f6d158b63b3 Mon Sep 17 00:00:00 2001
 From: Swaminathan Vasudevan <SVasudevan@suse.com>
-Date: Fri, 26 Jan 2018 14:25:32 -0800
-Subject: [PATCH] Add support for SUSE in osutils to handle networks
+Date: Wed, 7 Feb 2018 09:09:28 -0800
+Subject: Update osutil support for SUSE distro
 
-Add support for SUSE in osutils to handle network
-pluging inside the namespace.
-SUSE distro specific network related OS handling
-routines are added along with thier template files
+Provide osutil support for SUSE distro to create networks
+in a SUSE distro based Amphora Image.
+This is a generic patch that can support different SUSE
+flavors.
+This patch will be the base patch and the diskimage builder
+and devstack related changes to include the elements to build
+the required services will depend on this patch
+
+Change-Id: I29eeebb15a58cc54789edcb11c64ba47373cfb7b
 ---
  .../amphorae/backends/agent/api_server/osutils.py  | 149 +++++++++++++++++++++
  .../templates/suse_plug_port_ethX.conf.j2          |  45 +++++++
  .../templates/suse_plug_vip_ethX.conf.j2           |  59 ++++++++
  .../api_server/templates/suse_route_ethX.conf.j2   |  23 ++++
- 4 files changed, 276 insertions(+)
+ octavia/common/constants.py                        |   1 +
+ 5 files changed, 277 insertions(+)
  create mode 100644 octavia/amphorae/backends/agent/api_server/templates/suse_plug_port_ethX.conf.j2
  create mode 100644 octavia/amphorae/backends/agent/api_server/templates/suse_plug_vip_ethX.conf.j2
  create mode 100644 octavia/amphorae/backends/agent/api_server/templates/suse_route_ethX.conf.j2
 
 diff --git a/octavia/amphorae/backends/agent/api_server/osutils.py b/octavia/amphorae/backends/agent/api_server/osutils.py
-index 3d1babf5..91db7451 100644
+index 3d1babf..1515da2 100644
 --- a/octavia/amphorae/backends/agent/api_server/osutils.py
 +++ b/octavia/amphorae/backends/agent/api_server/osutils.py
 @@ -452,3 +452,152 @@ class RH(BaseOS):
@@ -38,7 +44,7 @@ index 3d1babf5..91db7451 100644
 +        return os_name in ['openSuse', 'SuSE', 'SUSE']
 +
 +    def cmd_get_version_of_installed_package(self, package_name):
-+        return "dpkg --status {name}".format(name=package_name)
++        return "rpm -qi {name}".format(name=package_name)
 +
 +    def get_network_interface_file(self, interface):
 +        if CONF.amphora_agent.agent_server_network_file:
@@ -63,7 +69,7 @@ index 3d1babf5..91db7451 100644
 +        network_prefixdir = os.path.basename(network_dirname)
 +        return os.path.join(network_prefixdir, network_basename)
 +
-+    def static_routes_interface_file(self, interface):
++    def get_static_routes_interface_file(self, interface):
 +        return self.get_network_interface_file('ifroute-' + interface)
 +
 +    def create_netns_dir(
@@ -104,7 +110,7 @@ index 3d1babf5..91db7451 100644
 +        # NOTE: Copy{netns}/etc/sysconfig/network/ifroute-* file to
 +        # /etc/sysconfig/network to overcome an issue with the
 +        # ifup-route and namespace.
-+        dst = '/etc/sysconfig/network'
++        dst = self.get_network_path()
 +        shutil.copy2(routes_interface_file_path, dst)
 +
 +    def write_static_routes_interface_file(self, interface_file_path,
@@ -145,7 +151,7 @@ index 3d1babf5..91db7451 100644
 +    def _bring_ns_if_up(self, interface, what):
 +        # Note, we are not using pyroute2 for this as it is not /etc/netns
 +        # aware.
-+        os.chdir('/etc/sysconfig/network')
++        os.chdir(self.get_network_path())
 +        cmd = ("ip netns exec {ns} ifup.ns {params}".format(
 +            ns=consts.AMPHORA_NAMESPACE, params=interface))
 +        try:
@@ -160,7 +166,7 @@ index 3d1babf5..91db7451 100644
 +    def _bring_ns_if_down(self, interface):
 +        # Note, we are not using pyroute2 for this as it is not /etc/netns
 +        # aware.
-+        os.chdir('/etc/sysconfig/network')
++        os.chdir(self.get_network_path())
 +        cmd = ("ip netns exec {ns} ifdown.ns {params}".format(
 +            ns=consts.AMPHORA_NAMESPACE, params=interface))
 +        try:
@@ -176,7 +182,7 @@ index 3d1babf5..91db7451 100644
 +        return True
 diff --git a/octavia/amphorae/backends/agent/api_server/templates/suse_plug_port_ethX.conf.j2 b/octavia/amphorae/backends/agent/api_server/templates/suse_plug_port_ethX.conf.j2
 new file mode 100644
-index 00000000..e130c3b8
+index 0000000..e130c3b
 --- /dev/null
 +++ b/octavia/amphorae/backends/agent/api_server/templates/suse_plug_port_ethX.conf.j2
 @@ -0,0 +1,45 @@
@@ -227,7 +233,7 @@ index 00000000..e130c3b8
 +
 diff --git a/octavia/amphorae/backends/agent/api_server/templates/suse_plug_vip_ethX.conf.j2 b/octavia/amphorae/backends/agent/api_server/templates/suse_plug_vip_ethX.conf.j2
 new file mode 100644
-index 00000000..79390a38
+index 0000000..79390a3
 --- /dev/null
 +++ b/octavia/amphorae/backends/agent/api_server/templates/suse_plug_vip_ethX.conf.j2
 @@ -0,0 +1,59 @@
@@ -292,7 +298,7 @@ index 00000000..79390a38
 +{%- endif %}
 diff --git a/octavia/amphorae/backends/agent/api_server/templates/suse_route_ethX.conf.j2 b/octavia/amphorae/backends/agent/api_server/templates/suse_route_ethX.conf.j2
 new file mode 100644
-index 00000000..2ed706a7
+index 0000000..2ed706a
 --- /dev/null
 +++ b/octavia/amphorae/backends/agent/api_server/templates/suse_route_ethX.conf.j2
 @@ -0,0 +1,23 @@
@@ -319,6 +325,18 @@ index 00000000..2ed706a7
 +{%- if gateway %}
 +default  {{ gateway }} - - 
 +{%- endif %}
+diff --git a/octavia/common/constants.py b/octavia/common/constants.py
+index 5584135..79b00c0 100644
+--- a/octavia/common/constants.py
++++ b/octavia/common/constants.py
+@@ -434,6 +434,7 @@ TESTING = 'testing'
+ # Amphora distro-specific data
+ UBUNTU_AMP_NET_DIR_TEMPLATE = '/etc/netns/{netns}/network/interfaces.d/'
+ RH_AMP_NET_DIR_TEMPLATE = '/etc/netns/{netns}/sysconfig/network-scripts/'
++SUSE_AMP_NET_DIR_TEMPLATE = '/etc/netns/{netns}/sysconfig/network/'
+ UBUNTU = 'ubuntu'
+ CENTOS = 'centos'
+ 
 -- 
-2.13.6
+cgit v1.1
 
--- openstack-octavia.changes.orig
+++ openstack-octavia.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Fri Apr 13 08:22:18 UTC 2018 - aplanas@suse.com
+
+- Rebase patch to fix a constant issue in Amphora VM (bsc#1089414)
+
+-------------------------------------------------------------------
 Fri Apr  6 02:24:47 UTC 2018 -  cloud-devel@suse.de
 
 - Update to version octavia-1.0.2.dev18:
--- openstack-octavia.spec.orig
+++ openstack-octavia.spec
@@ -208,6 +208,10 @@ This package contains OpenStack Octavia
 # new files from the templates into the file. Please, drop this once
 # the patch is merged upstream
 templates=octavia/amphorae/backends/agent/api_server/templates
+# NOTE(Swami) Add this line below so that the SOURCES.txt
+# file is formatted properly and the suse_plug_port_ethX.conf.j2
+# is added
+echo $ >> octavia.egg-info/SOURCES.txt
 echo $templates/suse_plug_port_ethX.conf.j2 >> octavia.egg-info/SOURCES.txt
 echo $templates/suse_plug_vip_ethX.conf.j2 >> octavia.egg-info/SOURCES.txt
 echo $templates/suse_route_ethX.conf.j2 >> octavia.egg-info/SOURCES.txt

Places

File project.diff of Package openstack-octavia (Revision 3e1b82bbb464fa7de0b9c8fd1550bc07)

Places