Migrates master to use direct upstream

We now move master to deploy from upstream.  That means we do not need
to build undercloud/overcloud images anymore.

Changes-Include:
 - Remove bash build scripts as we do not need to build anything
   other than the python package anymore
 - Remove building images or iso from build.py
 - Remove building of images and iso from Makefile
 - Rename/refactor deploy settings files for nosdn and odl.  The new
   convention is that the typical scenario names we use will deploy
   master.  We also support n-1 OS, so in that case we use the branch
   name for the "feature" in the scenario name: os-odl-queens-noha.
 - Tacker/Congress are disabled in settings files until we fix that with
   upstream.  Containers are now enabled by default.
 - Disable TLS for undercloud (was changed upstream to default enabled)
 - Fix environments docker directory for master THT (was changed upstream)
 - Includes fix for LP#1768901
 - Includes workaround for LP#1770692
 - Moves to docker.io for container images as it is more stable and
   should contain the same images
 - Removes the term 'common' from apex packaging for referencing the
   Python Apex package

Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a
Signed-off-by: Tim Rozet <trozet@redhat.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py
index ae2e8f0b..b69c44d0 100644
--- a/apex/tests/test_apex_overcloud_deploy.py
+++ b/apex/tests/test_apex_overcloud_deploy.py
@@ -134,7 +134,8 @@ class TestOvercloudDeploy(unittest.TestCase):
                'barometer': False,
                'ceph': True,
                'sdn_controller': 'opendaylight',
-               'sriov': False
+               'sriov': False,
+               'os_version': 'queens'
                },
               'global_params': MagicMock()}
 
@@ -158,6 +159,10 @@ class TestOvercloudDeploy(unittest.TestCase):
                   'storage-environment.yaml', result_cmd)
         assert_in('/usr/share/openstack-tripleo-heat-templates/environments'
                   '/services-docker/neutron-opendaylight.yaml', result_cmd)
+        ds['deploy_options']['os_version'] = 'master'
+        result_cmd = create_deploy_cmd(ds, ns, inv, '/tmp', virt)
+        assert_in('/usr/share/openstack-tripleo-heat-templates/environments'
+                  '/services/neutron-opendaylight.yaml', result_cmd)
 
     @patch('apex.overcloud.deploy.prep_sriov_env')
     @patch('apex.overcloud.deploy.prep_storage_env')
@@ -170,6 +175,8 @@ class TestOvercloudDeploy(unittest.TestCase):
               'global_params': MagicMock()}
         ds['global_params'].__getitem__.side_effect = \
             lambda i: False if i == 'ha_enabled' else MagicMock()
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: 'master' if i == 'os_version' else MagicMock()
         ns = {'ntp': ['ntp']}
         inv = MagicMock()
         inv.get_node_counts.return_value = (3, 2)
@@ -191,6 +198,8 @@ class TestOvercloudDeploy(unittest.TestCase):
         mock_sdn_list.return_value = []
         ds = {'deploy_options': MagicMock(),
               'global_params': MagicMock()}
+        ds['deploy_options'].__getitem__.side_effect = \
+            lambda i: 'master' if i == 'os_version' else MagicMock()
         ns = {}
         inv = MagicMock()
         inv.get_node_counts.return_value = (0, 0)
@@ -648,7 +657,8 @@ class TestOvercloudDeploy(unittest.TestCase):
                    'containers': False,
                    'barometer': True,
                    'ceph': False,
-                   'sdn_controller': 'opendaylight'
+                   'sdn_controller': 'opendaylight',
+                   'os_version': 'queens'
                    }
         output = get_docker_sdn_file(ds_opts)
         self.assertEqual(output,