Merge "Move 'linux_system_repo_*_url' to defaults"
diff --git a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
new file mode 100644
index 0000000..bf5b5b9
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
@@ -0,0 +1,22 @@
+parameters:
+ _param:
+ mirror_mirantis_com_ceph_luminous_xenial_force: False
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_ceph_luminous_xenial:
+ force: ${_param:mirror_mirantis_com_ceph_luminous_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:apt_mk_version}/ceph-luminous/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/ceph-luminous/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_ceph_luminous_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='(-dbg_|-dbg-)'"
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/docker/xenial.yml b/debmirror/mirror_mirantis_com/docker/xenial.yml
new file mode 100644
index 0000000..1ed38a9
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/docker/xenial.yml
@@ -0,0 +1,26 @@
+parameters:
+ _param:
+ mirror_mirantis_com_docker_xenial_force: False
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_docker_xenial:
+ force: ${_param:mirror_mirantis_com_docker_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:apt_mk_version}/docker/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/docker/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_docker_xenial.log"
+ dist: [ xenial ]
+ section: [ stable ]
+ filter:
+ # Include only latest Docker packages >= 18.06 && >= 17.12
+ 001: "--exclude='docker-ce'"
+ 002: "--include='docker-ce_18.((0[6-9])|([1-9][0-9]))'"
+ 003: "--include='docker-ce_17.((1[2-9])|([2-9][0-9]))'"
+ 003: "--include='docker-ce_((19)|([2-9][0-9]))'"
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/extra/xenial.yml b/debmirror/mirror_mirantis_com/extra/xenial.yml
new file mode 100644
index 0000000..892abd4
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/extra/xenial.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ mirror_mirantis_com_extra_xenial_force: False
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_extra_xenial:
+ force: ${_param:mirror_mirantis_com_extra_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:apt_mk_version}/extra/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/extra/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_extra_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
new file mode 100644
index 0000000..3e6dca0
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ mirror_mirantis_com_openstack_pike_xenial_force: False
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_openstack_pike_xenial:
+ force: ${_param:mirror_mirantis_com_openstack_pike_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:apt_mk_version}/openstack-pike/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-pike/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_pike_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
new file mode 100644
index 0000000..99dec3b
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ mirror_mirantis_com_openstack_queens_xenial_force: False
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_openstack_queens_xenial:
+ force: ${_param:mirror_mirantis_com_openstack_queens_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:apt_mk_version}/openstack-queens/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-queens/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_queens_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
\ No newline at end of file
diff --git a/debmirror/mirror_mirantis_com/td-agent/xenial.yml b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
new file mode 100644
index 0000000..d141967
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ mirror_mirantis_com_td_agent_xenial_force: False
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_td_agent_xenial:
+ force: ${_param:mirror_mirantis_com_td_agent_xenial_force}
+ lock_target: True
+ td_agent_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-td_agent=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:apt_mk_version}/td-agent/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/td-agent/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_td_agent_xenial.log"
+ dist: [ xenial ]
+ section: [ contrib ]
\ No newline at end of file
diff --git a/salt/control/cluster/init.yml b/salt/control/cluster/init.yml
index 49d30b3..20ae7fa 100644
--- a/salt/control/cluster/init.yml
+++ b/salt/control/cluster/init.yml
@@ -7,3 +7,9 @@
internal:
rng:
backend: ${_param:salt_control_cluster_rng_backend}
+ seed: cloud-init
+ cloud_init:
+ user_data:
+ salt_minion:
+ conf:
+ master: ${_param:infra_config_deploy_address}