Migrate some data to rs/defaults
* Drop variables:
- local_docker_client_registry_target_registry
- docker_image_aptly
* Migrate maas, git artifacts
* fix dir.permission
Prod-related: PROD-26662 (PROD:26662)
Change-Id: I29dcd5a6e4598b2bc81ab3a0a95727715d8608d5
diff --git a/init.yml b/init.yml
index 460c8c5..7f18fd4 100644
--- a/init.yml
+++ b/init.yml
@@ -18,13 +18,8 @@
# Upstream mirrors:
#mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
#vcp_images_mirror: 'http://images.mirantis.com'
- vcp_images_mirror: 'http://images.mcp.mirantis.net/'
+ mcp_static_images_url: 'http://images.mcp.mirantis.net/'
mcp_docker_registry: 'docker-prod-local.docker.mirantis.net'
- local_docker_client_registry_target_registry: apt:5000
- docker_image_aptly:
- base: ${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:apt_mk_version}
- public: ${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:${_param:apt_mk_version}
- publisher: ${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:${_param:apt_mk_version}
aptly_gpg_private_key: |
-----BEGIN PGP PRIVATE KEY BLOCK-----
Version: GnuPG v1
@@ -128,7 +123,7 @@
publisher:
component: updates
distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
+ - ubuntu-xenial/${_param:mcp_version}
- ubuntu-xenial/stable
docker:
host:
@@ -143,27 +138,14 @@
storage-driver: overlay2
client:
registry:
- target_registry: ${_param:local_docker_client_registry_target_registry}
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}
# List of images now at reclass-system/defaults
- image: ${_param:local_registry_mirror_image_list}
+ image:
+ ${_param:default_local_mirrror_content:docker_client_registry_image}
git:
server:
directory: /srv/git/
- repos:
- - name: mk-pipelines
- url: https://github.com/Mirantis/mk-pipelines.git
- - name: pipeline-library
- url: https://github.com/Mirantis/pipeline-library.git
- - name: cvp-sanity-checks
- url: https://github.com/Mirantis/cvp-sanity-checks.git
- - name: cvp-spt
- url: https://github.com/Mirantis/cvp-spt.git
- - name: stacklight-pytest
- url: https://github.com/Mirantis/stacklight-pytest
- - name: cvp-configuration
- url: https://github.com/Mirantis/cvp-configuration.git
- - name: rundeck-cis-jobs
- url: https://github.com/Mirantis/rundeck-cis-jobs.git
+ repos: ${_param:default_local_mirrror_content:git_server_repos}
nginx:
server:
site:
@@ -217,26 +199,21 @@
port: 5000
linux:
system:
+ # List of files now at reclass-system/defaults
file:
- ubuntu-16-04-x64.qcow2:
- name: /srv/http/images/ubuntu-16-04-x64-mcp${_param:apt_mk_version}.qcow2
- source: ${_param:vcp_images_mirror}/ubuntu-16-04-x64-mcp${_param:apt_mk_version}.qcow2
- hash: ${_param:vcp_images_mirror}/ubuntu-16-04-x64-mcp${_param:apt_mk_version}.qcow2.md5
- ubuntu-16-04-x64.qcow2.md5:
- name: /srv/http/images/ubuntu-16-04-x64-mcp${_param:apt_mk_version}.qcow2.md5
- source: ${_param:vcp_images_mirror}/ubuntu-16-04-x64-mcp${_param:apt_mk_version}.qcow2.md5
+ ${_param:default_local_mirrror_content:linux_system_file}
profile:
locales: |
export LC_ALL=C
directory:
/srv/http/images:
- user: root
- group: root
+ user: www-data
+ group: www-data
mode: 755
makedirs: true
/srv/scripts/:
- user: root
- group: root
+ user: www-data
+ group: www-data
mode: 755
makedirs: true
maas:
@@ -244,16 +221,4 @@
enabled: true
image:
sections:
- bootloaders:
- keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
- upstream: http://mirror.mirantis.com/${_param:apt_mk_version}/maas-ephemeral-v3/
- local_dir: /srv/http/${_param:apt_mk_version}/maas-ephemeral-v3/
- count: 1
- # i386 need for pxe
- filters: ['arch~(i386|amd64)', 'os~(grub*|pxelinux*)']
- xenial:
- keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
- upstream: http://mirror.mirantis.com/${_param:apt_mk_version}/maas-ephemeral-v3/
- local_dir: /srv/http/${_param:apt_mk_version}/maas-ephemeral-v3/
- count: 1
- filters: ['release~(xenial)', 'arch~(amd64)', 'subarch~(generic|hwe-16*|ga-16*)']
+ ${_param:default_local_mirrror_content:maas_mirror_image_sections}