Merge "Revert "support http/https proxy for discovery url"" into stable/rocky

magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh

@@ -96,16 +96,6 @@ EOF
 
 fi
 
-if [ -n "$HTTP_PROXY" -o "$HTTPS_PROXY" ]; then
+if [ -n "$HTTP_PROXY" ]; then
-    ETCD_DISCOVERY_PROTOCOL=$(python -c "from six.moves.urllib import parse as urlparse; print urlparse.urlparse('${ETCD_DISCOVERY_URL}').scheme")
+    echo "ETCD_DISCOVERY_PROXY=$HTTP_PROXY" >> /etc/etcd/etcd.conf
-    ETCD_DISCOVERY_HOSTNAME=$(python -c "from six.moves.urllib import parse as urlparse; print urlparse.urlparse('${ETCD_DISCOVERY_URL}').netloc.partition(':')[0]")
-    # prints 1 if $ETCD_DISCOVERY_HOSTNAME is listed explicitly in $NO_PROXY, or $NO_PROXY is set to "*"
-    ETCD_DISCOVERY_PROXY_BYPASS=$(NO_PROXY="${NO_PROXY}" python -c "import requests; print requests.utils.proxy_bypass('${ETCD_DISCOVERY_HOSTNAME}')")
-    if [ $ETCD_DISCOVERY_PROXY_BYPASS == "0" ]; then
-        if [ -n "$HTTP_PROXY" -a "$ETCD_DISCOVERY_PROTOCOL" == "http" ]; then
-            echo "ETCD_DISCOVERY_PROXY=$HTTP_PROXY" >> /etc/etcd/etcd.conf
-        elif [ -n "$HTTPS_PROXY" -a "$ETCD_DISCOVERY_PROTOCOL" == "https" ]; then
-            echo "ETCD_DISCOVERY_PROXY=$HTTPS_PROXY" >> /etc/etcd/etcd.conf
-        fi
-    fi
 fi

magnum/drivers/heat/k8s_template_def.py

@@ -96,8 +96,7 @@ class K8sTemplateDefinition(template_def.BaseTemplateDefinition):
     def get_params(self, context, cluster_template, cluster, **kwargs):
         extra_params = kwargs.pop('extra_params', {})
 
-        extra_params['discovery_url'] = \
+        extra_params['discovery_url'] = self.get_discovery_url(cluster)
-            self.get_discovery_url(cluster, cluster_template=cluster_template)
         osc = self.get_osc(context)
         extra_params['magnum_url'] = osc.magnum_url()
 

magnum/drivers/heat/swarm_fedora_template_def.py

@@ -90,8 +90,7 @@ class SwarmFedoraTemplateDefinition(template_def.BaseTemplateDefinition):
 
     def get_params(self, context, cluster_template, cluster, **kwargs):
         extra_params = kwargs.pop('extra_params', {})
-        extra_params['discovery_url'] = \
+        extra_params['discovery_url'] = self.get_discovery_url(cluster)
-            self.get_discovery_url(cluster, cluster_template=cluster_template)
         # HACK(apmelton) - This uses the user's bearer token, ideally
         # it should be replaced with an actual trust token with only
         # access to do what the template needs it to do.

magnum/drivers/heat/template_def.py

@@ -15,10 +15,8 @@ import abc
 import ast
 
 from oslo_log import log as logging
-import re
 import requests
 import six
-from six.moves.urllib import parse as urlparse
 
 from magnum.common import clients
 from magnum.common import exception
@@ -306,26 +304,7 @@ class BaseTemplateDefinition(TemplateDefinition):
                 size=int(value),
                 discovery_url=discovery_url)
 
-    def get_proxies(self, url, cluster_template):
+    def get_discovery_url(self, cluster):
-        proxies = dict()
-        if cluster_template is None:
-            return proxies
-        hostname = urlparse.urlparse(url).netloc.partition(":")[0]
-        if hasattr(cluster_template, 'no_proxy') and \
-            cluster_template.no_proxy and \
-            (cluster_template.no_proxy == '*' or
-             re.search('\\b%s\\b' % re.escape(hostname),
-                       cluster_template.no_proxy, re.I)):
-            LOG.debug('Bypass proxy, because discovery hostname is listed in'
-                      ' cluster template no_proxy variable')
-        else:
-            if hasattr(cluster_template, 'http_proxy'):
-                proxies['http'] = cluster_template.http_proxy
-            if hasattr(cluster_template, 'https_proxy'):
-                proxies['https'] = cluster_template.https_proxy
-        return proxies
-
-    def get_discovery_url(self, cluster, cluster_template=None):
         if hasattr(cluster, 'discovery_url') and cluster.discovery_url:
             if getattr(cluster, 'master_count', None) is not None:
                 self.validate_discovery_url(cluster.discovery_url,
@@ -338,10 +317,7 @@ class BaseTemplateDefinition(TemplateDefinition):
                 CONF.cluster.etcd_discovery_service_endpoint_format %
                 {'size': cluster.master_count})
             try:
-                proxies = self.get_proxies(discovery_endpoint,
+                discovery_request = requests.get(discovery_endpoint)
-                                           cluster_template)
-                discovery_request = requests.get(discovery_endpoint,
-                                                 proxies=proxies)
                 if discovery_request.status_code != requests.codes.ok:
                     raise exception.GetDiscoveryUrlFailed(
                         discovery_endpoint=discovery_endpoint)

magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py

@@ -972,8 +972,7 @@ class TestClusterConductorWithK8s(base.TestCase):
              '../../common/templates/environments/disable_floating_ip.yaml',
              ],
             env_files)
-        reqget.assert_called_once_with('http://etcd/test?size=1', proxies={
+        reqget.assert_called_once_with('http://etcd/test?size=1')
-            'http': 'http_proxy', 'https': 'https_proxy'})
 
     @patch('magnum.common.short_id.generate_id')
     @patch('heatclient.common.template_utils.get_template_contents')

magnum/tests/unit/drivers/test_template_definition.py

@@ -901,92 +901,7 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase):
         k8s_def = k8sa_tdef.AtomicK8sTemplateDefinition()
         discovery_url = k8s_def.get_discovery_url(mock_cluster)
 
-        mock_get.assert_called_once_with('http://etcd/test?size=10',
+        mock_get.assert_called_once_with('http://etcd/test?size=10')
-                                         proxies={})
-        self.assertEqual(expected_discovery_url, mock_cluster.discovery_url)
-        self.assertEqual(expected_discovery_url, discovery_url)
-
-    @mock.patch('requests.get')
-    def test_k8s_get_discovery_url_proxy(self, mock_get):
-        CONF.set_override('etcd_discovery_service_endpoint_format',
-                          'http://etcd/test?size=%(size)d',
-                          group='cluster')
-        expected_discovery_url = 'http://etcd/token'
-        mock_resp = mock.MagicMock()
-        mock_resp.status_code = 200
-        mock_resp.text = expected_discovery_url
-        mock_get.return_value = mock_resp
-        mock_cluster = mock.MagicMock()
-        mock_cluster.master_count = 10
-        mock_cluster.discovery_url = None
-
-        mock_cluster_template = mock.MagicMock()
-        mock_cluster_template.http_proxy = 'http_proxy'
-        mock_cluster_template.https_proxy = 'https_proxy'
-        mock_cluster_template.no_proxy = 'localhost,127.0.0.1'
-
-        k8s_def = k8sa_tdef.AtomicK8sTemplateDefinition()
-        discovery_url = k8s_def.get_discovery_url(mock_cluster,
-                                                  mock_cluster_template)
-
-        mock_get.assert_called_once_with('http://etcd/test?size=10', proxies={
-            'http': 'http_proxy', 'https': 'https_proxy'})
-        self.assertEqual(expected_discovery_url, mock_cluster.discovery_url)
-        self.assertEqual(expected_discovery_url, discovery_url)
-
-    @mock.patch('requests.get')
-    def test_k8s_get_discovery_url_no_proxy(self, mock_get):
-        CONF.set_override('etcd_discovery_service_endpoint_format',
-                          'http://etcd/test?size=%(size)d',
-                          group='cluster')
-        expected_discovery_url = 'http://etcd/token'
-        mock_resp = mock.MagicMock()
-        mock_resp.status_code = 200
-        mock_resp.text = expected_discovery_url
-        mock_get.return_value = mock_resp
-        mock_cluster = mock.MagicMock()
-        mock_cluster.master_count = 10
-        mock_cluster.discovery_url = None
-
-        mock_cluster_template = mock.MagicMock()
-        mock_cluster_template.http_proxy = 'http_proxy'
-        mock_cluster_template.https_proxy = 'https_proxy'
-        mock_cluster_template.no_proxy = 'localhost,127.0.0.1,etcd'
-
-        k8s_def = k8sa_tdef.AtomicK8sTemplateDefinition()
-        discovery_url = k8s_def.get_discovery_url(mock_cluster,
-                                                  mock_cluster_template)
-
-        mock_get.assert_called_once_with('http://etcd/test?size=10',
-                                         proxies={})
-        self.assertEqual(expected_discovery_url, mock_cluster.discovery_url)
-        self.assertEqual(expected_discovery_url, discovery_url)
-
-    @mock.patch('requests.get')
-    def test_k8s_get_discovery_url_no_proxy_wildcard(self, mock_get):
-        CONF.set_override('etcd_discovery_service_endpoint_format',
-                          'http://etcd/test?size=%(size)d',
-                          group='cluster')
-        expected_discovery_url = 'http://etcd/token'
-        mock_resp = mock.MagicMock()
-        mock_resp.status_code = 200
-        mock_resp.text = expected_discovery_url
-        mock_get.return_value = mock_resp
-        mock_cluster = mock.MagicMock()
-        mock_cluster.master_count = 10
-        mock_cluster.discovery_url = None
-
-        mock_cluster_template = mock.MagicMock()
-        mock_cluster_template.http_proxy = 'http_proxy'
-        mock_cluster_template.https_proxy = 'https_proxy'
-        mock_cluster_template.no_proxy = '*'
-
-        k8s_def = k8sa_tdef.AtomicK8sTemplateDefinition()
-        discovery_url = k8s_def.get_discovery_url(mock_cluster,
-                                                  mock_cluster_template)
-
-        mock_get.assert_called_once_with('http://etcd/test?size=10',
-                                         proxies={})
         self.assertEqual(expected_discovery_url, mock_cluster.discovery_url)
         self.assertEqual(expected_discovery_url, discovery_url)
 
@@ -1559,84 +1474,7 @@ class AtomicSwarmTemplateDefinitionTestCase(base.TestCase):
         swarm_def = swarm_tdef.AtomicSwarmTemplateDefinition()
         discovery_url = swarm_def.get_discovery_url(mock_cluster)
 
-        mock_get.assert_called_once_with('http://etcd/test?size=1', proxies={})
+        mock_get.assert_called_once_with('http://etcd/test?size=1')
-        self.assertEqual(mock_cluster.discovery_url, expected_discovery_url)
-        self.assertEqual(discovery_url, expected_discovery_url)
-
-    @mock.patch('requests.get')
-    def test_swarm_get_discovery_url_proxy(self, mock_get):
-        CONF.set_override('etcd_discovery_service_endpoint_format',
-                          'http://etcd/test?size=%(size)d',
-                          group='cluster')
-        expected_discovery_url = 'http://etcd/token'
-        mock_resp = mock.MagicMock()
-        mock_resp.status_code = 200
-        mock_resp.text = expected_discovery_url
-        mock_get.return_value = mock_resp
-        mock_cluster = mock.MagicMock()
-        mock_cluster.discovery_url = None
-
-        mock_cluster_template = mock.MagicMock()
-        mock_cluster_template.http_proxy = 'http_proxy'
-        mock_cluster_template.https_proxy = 'https_proxy'
-        mock_cluster_template.no_proxy = 'localhost,127.0.0.1'
-
-        swarm_def = swarm_tdef.AtomicSwarmTemplateDefinition()
-        discovery_url = swarm_def.get_discovery_url(mock_cluster,
-                                                    mock_cluster_template)
-
-        mock_get.assert_called_once_with('http://etcd/test?size=1', proxies={
-            'http': 'http_proxy', 'https': 'https_proxy'})
-        self.assertEqual(mock_cluster.discovery_url, expected_discovery_url)
-        self.assertEqual(discovery_url, expected_discovery_url)
-
-    @mock.patch('requests.get')
-    def test_swarm_get_discovery_url_no_proxy(self, mock_get):
-        CONF.set_override('etcd_discovery_service_endpoint_format',
-                          'http://etcd/test?size=%(size)d',
-                          group='cluster')
-        expected_discovery_url = 'http://etcd/token'
-        mock_resp = mock.MagicMock()
-        mock_resp.status_code = 200
-        mock_resp.text = expected_discovery_url
-        mock_get.return_value = mock_resp
-        mock_cluster = mock.MagicMock()
-        mock_cluster.discovery_url = None
-
-        mock_cluster_template = mock.MagicMock()
-        mock_cluster_template.http_proxy = 'http_proxy'
-        mock_cluster_template.https_proxy = 'https_proxy'
-        mock_cluster_template.no_proxy = 'etcd,localhost,127.0.0.1'
-
-        swarm_def = swarm_tdef.AtomicSwarmTemplateDefinition()
-        discovery_url = swarm_def.get_discovery_url(mock_cluster)
-
-        mock_get.assert_called_once_with('http://etcd/test?size=1', proxies={})
-        self.assertEqual(mock_cluster.discovery_url, expected_discovery_url)
-        self.assertEqual(discovery_url, expected_discovery_url)
-
-    @mock.patch('requests.get')
-    def test_swarm_get_discovery_url_no_proxy_wildcard(self, mock_get):
-        CONF.set_override('etcd_discovery_service_endpoint_format',
-                          'http://etcd/test?size=%(size)d',
-                          group='cluster')
-        expected_discovery_url = 'http://etcd/token'
-        mock_resp = mock.MagicMock()
-        mock_resp.status_code = 200
-        mock_resp.text = expected_discovery_url
-        mock_get.return_value = mock_resp
-        mock_cluster = mock.MagicMock()
-        mock_cluster.discovery_url = None
-
-        mock_cluster_template = mock.MagicMock()
-        mock_cluster_template.http_proxy = 'http_proxy'
-        mock_cluster_template.https_proxy = 'https_proxy'
-        mock_cluster_template.no_proxy = '*'
-
-        swarm_def = swarm_tdef.AtomicSwarmTemplateDefinition()
-        discovery_url = swarm_def.get_discovery_url(mock_cluster)
-
-        mock_get.assert_called_once_with('http://etcd/test?size=1', proxies={})
         self.assertEqual(mock_cluster.discovery_url, expected_discovery_url)
         self.assertEqual(discovery_url, expected_discovery_url)