Offline related updates

 * Unfify offline content variable
   Collect all data in 'default_local_mirrror_content'
   variable would allow to extend default set in future
   w\o removing|renaming original one
   - add git mirror list
 * Add amphora image for pike|queens
 * debmirror:ubuntu
   - add requirment for dogtag
 * Misc:
   remove duplicate in defaults - linux_system_repo_url
   Fix defaults:openstack:amphora path

Prod-related: PROD-26662 (PROD:26662)
Bug-fix: PROD-26807 (PROD:26807)

Change-Id: I77f0a3648a0a74f70d29ba388e194c51725744f0
diff --git a/defaults/linux_system_file.yml b/defaults/linux_system_file.yml
index c8080c4..153c200 100644
--- a/defaults/linux_system_file.yml
+++ b/defaults/linux_system_file.yml
@@ -3,8 +3,8 @@
     # List of files, to be placed into offline image, during separate image build process
     # By default, will be avaible http_server
     # WARNING: file path and names - must be exactly same as in any other place in reclass-system!
-    local_http_files_list:
-      file:
+    default_local_mirrror_content:
+      linux_system_file:
         ubuntu-16-04-x64.qcow2:
           name: /srv/http/images.mirantis.com/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2
           source: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2
@@ -12,3 +12,17 @@
         ubuntu-16-04-x64.qcow2.md5:
           name: /srv/http/images.mirantis.com/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2.md5
           source: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2.md5
+        amphora-x64-haproxy-pike.qcow2:
+          source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2
+          name: /srv/http/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2
+          hash: /srv/http/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2.md5
+        amphora-x64-haproxy-pike.qcow2:
+          source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2.md5
+          name: /srv/http/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2.md5
+        amphora-x64-haproxy-queens.qcow2:
+          source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2
+          name: /srv/http/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2
+          hash: /srv/http/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2.md5
+        amphora-x64-haproxy-queens.qcow2.md5:
+          source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2.md5
+          name: /srv/http/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2