commit 730518a2ab603863717f3067b5ea1fc15adab5ad
author Jiri Broulik <jbroulik@mirantis.com> Thu Apr 12 11:29:38 2018 +0200
committer Jiri Broulik <jbroulik@mirantis.com> Thu Apr 12 11:34:50 2018 +0200
tree 29b3e8dc29ae2f8040701a03d7d894144dc5879b
parent 610efee71391c98e08d59b679c88276c5802e34b

day01 maas mirror moved to offline image

Change-Id: I9dd6419adb499a4a0b58a58932782c967e1b37f2

classes/cluster/mcp-day01/infra/jenkins.yml

diff --git a/classes/cluster/mcp-day01/infra/jenkins.yml b/classes/cluster/mcp-day01/infra/jenkins.yml
index 3e1b6a9..47487a8 100644
--- a/classes/cluster/mcp-day01/infra/jenkins.yml
+++ b/classes/cluster/mcp-day01/infra/jenkins.yml
@@ -71,6 +71,13 @@
           version: latest
         virtualenv:
           version: latest
+      # file for backwards compatibility of mcp-common-scripts
+      file:
+        /var/lib/jenkins/jenkins.model.JenkinsLocationConfiguration.xml:
+          user: jenkins
+          group: jenkins
+          mode: 644
+          makedirs: true
       config:
         jenkins_master:
           pillar:

classes/cluster/mcp-day01/infra/maas.yml

diff --git a/classes/cluster/mcp-day01/infra/maas.yml b/classes/cluster/mcp-day01/infra/maas.yml
index efcc90b..010bcdd 100644
--- a/classes/cluster/mcp-day01/infra/maas.yml
+++ b/classes/cluster/mcp-day01/infra/maas.yml
@@ -14,16 +14,6 @@
     cluster:
       region:
         host: ${_param:deploy_address}:${_param:maas_cluster_region_port}
-    mirror:
-      enabled: true
-      image:
-        release:
-          xenial:
-            keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
-            upstream: http://images.maas.io/ephemeral-v3/daily/
-            local_dir: /var/www/html/maas/images/ephemeral-v3/daily
-            arch: amd64
-            count: 1
   postgresql:
     server:
       enabled: true