Merge "[salt.minion.cert] MySQL certificate and key"
diff --git a/.releasenotes/notes/remove-repo-includes-from-system-d4af8a0ac985d4e5.yaml b/.releasenotes/notes/remove-repo-includes-from-system-d4af8a0ac985d4e5.yaml
new file mode 100644
index 0000000..8ab3536
--- /dev/null
+++ b/.releasenotes/notes/remove-repo-includes-from-system-d4af8a0ac985d4e5.yaml
@@ -0,0 +1,19 @@
+---
+summary: >
+ Removed included classes for linux.system.repo from the system level reclass
+ model because they were breaking installation from local repos.
+features:
+ - |
+ Added linux.system.repo definition for MAAS.
+deprecations:
+ - |
+ Removed:
+ - system.linux.system.repo.mcp.salt from salt/master/pkg.yml
+ - system.linux.system.repo.docker from docker/host.yml
+ - service.maas.region.vendor_repo from maas/region/single.yml
+
+ These repos should be added to appropriate cluster level classes. New cluster
+ models from Cookiecutter have them already included.
+fixes:
+ - |
+ MCP deployments can now be installed from local repositories without problems.
\ No newline at end of file
diff --git a/docker/host.yml b/docker/host.yml
index 853a5d2..7e5fb8c 100644
--- a/docker/host.yml
+++ b/docker/host.yml
@@ -1,6 +1,5 @@
classes:
- service.docker.host
- - system.linux.system.repo.docker
parameters:
docker:
host:
diff --git a/jenkins/client/job/ceph/init.yml b/jenkins/client/job/ceph/init.yml
index e4be03e..4cfc6db 100644
--- a/jenkins/client/job/ceph/init.yml
+++ b/jenkins/client/job/ceph/init.yml
@@ -1,5 +1,6 @@
classes:
- system.jenkins.client.job.ceph.remove-osd
-- system.jenkins.client.job.ceph.add-node
- system.jenkins.client.job.ceph.replace-failed-osd
+- system.jenkins.client.job.ceph.add-node
+- system.jenkins.client.job.ceph.remove-node
diff --git a/jenkins/client/job/ceph/remove-node.yml b/jenkins/client/job/ceph/remove-node.yml
new file mode 100644
index 0000000..9ba449c
--- /dev/null
+++ b/jenkins/client/job/ceph/remove-node.yml
@@ -0,0 +1,46 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ ceph-remove-osd:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Ceph - remove node"
+ discard:
+ build:
+ keep_num: 50
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: ceph-remove-node.groovy
+ param:
+ # general parameters
+ SALT_MASTER_URL:
+ type: string
+ description: URL of Salt master
+ default: "http://${_param:salt_master_host}:6969"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ description: Credentials for login to Salt API
+ default: salt
+ HOST:
+ type: string
+ description: OSD HOST that will be removed from Ceph cluster (rgw04*)
+ default: 'rgw04*'
+ HOST_TYPE:
+ type: string
+ description: Type of Ceph node to be removed. Valid values are mon/osd/rgw
+ default: 'rgw'
+ ADMIN_HOST:
+ type: string
+ description: Host with admin keyring and access to cluster management
+ default: 'cmn01*'
+ GENERATE_CRUSHMAP:
+ type: boolean
+ default: 'false'
+ description: Only if removing OSD host. Set to true if crush map file should be updated. Enforce has to happen manually unless it is specifically set to be enforced in pillar.
+ WAIT_FOR_HEALTHY:
+ type: boolean
+ default: 'false'
+ description: Wait for healthy during pipeline
diff --git a/jenkins/client/job/deploy/lab/init.yml b/jenkins/client/job/deploy/lab/init.yml
index 0fce66b..52ec947 100644
--- a/jenkins/client/job/deploy/lab/init.yml
+++ b/jenkins/client/job/deploy/lab/init.yml
@@ -12,6 +12,7 @@
- system.jenkins.client.job.deploy.lab.component.kubernetes
- system.jenkins.client.job.deploy.lab.component.openstack
- system.jenkins.client.job.deploy.lab.component.stacklight
+ - system.jenkins.client.job.deploy.lab.ironic
parameters:
jenkins:
diff --git a/jenkins/client/job/deploy/lab/ironic.yml b/jenkins/client/job/deploy/lab/ironic.yml
new file mode 100644
index 0000000..8c397cf
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/ironic.yml
@@ -0,0 +1,79 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ ironic_node_provision:
+ concurrent: true
+ discard:
+ build:
+ keep_num: 20
+ display_name: Ironic - provision nodes
+ name: ironic-provision-nodes
+ param:
+ ASK_ON_ERROR:
+ default: 'false'
+ type: boolean
+ HEAT_STACK_ZONE:
+ default: mcp-mk
+ type: string
+ OPENSTACK_API_CLIENT:
+ default: ''
+ type: string
+ OPENSTACK_API_CREDENTIALS:
+ default: openstack-devcloud-credentials
+ type: string
+ OPENSTACK_API_PROJECT:
+ default: mcp-mk
+ type: string
+ OPENSTACK_API_PROJECT_DOMAIN:
+ default: default
+ type: string
+ OPENSTACK_API_PROJECT_ID:
+ default: ''
+ type: string
+ OPENSTACK_API_URL:
+ default: https://cloud-cz.bud.mirantis.net:5000
+ type: string
+ OPENSTACK_API_USER_DOMAIN:
+ default: default
+ type: string
+ OPENSTACK_API_USER_DOMAIN_ID:
+ default: default
+ type: string
+ OPENSTACK_API_VERSION:
+ default: '3'
+ type: string
+ ENV_NAME:
+ type: string
+ SALT_MASTER_CREDENTIALS:
+ default: salt-qa-credentials
+ type: string
+ SALT_MASTER_URL:
+ default: ''
+ type: string
+ STACK_TYPE:
+ default: heat
+ type: string
+ IRONIC_AUTHORIZATION_PROFILE:
+ default: admin_identity
+ type: string
+ IRONIC_DEPLOY_NODES:
+ default: ''
+ type: string
+ IRONIC_DEPLOY_PROFILE:
+ default: ''
+ type: string
+ IRONIC_DEPLOY_TIMEOUT:
+ default: '60'
+ type: string
+ IRONIC_DEPLOY_PARTITION_PROFILE:
+ default: ''
+ type: string
+ RUN_TARGET:
+ default: 'I@ironic:client and *01*'
+ type: string
+ scm:
+ script: ironic-node-provision-pipeline.groovy
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ type: workflow-scm
diff --git a/linux/system/repo/maas.yml b/linux/system/repo/maas.yml
new file mode 100644
index 0000000..d36784e
--- /dev/null
+++ b/linux/system/repo/maas.yml
@@ -0,0 +1,7 @@
+parameters:
+ linux:
+ system:
+ repo:
+ maas:
+ source: deb http://ppa.launchpad.net/maas/stable/ubuntu xenial main
+ key_url: salt://maas/files/vendor_key.gpg
\ No newline at end of file
diff --git a/maas/region/single.yml b/maas/region/single.yml
index 2bf9469..20779aa 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -1,7 +1,6 @@
classes:
- service.maas.region.single
- service.maas.cluster.single
- - service.maas.region.vendor_repo
parameters:
_param:
maas_admin_username: mirantis
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index dba30d0..ac839f8 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -9,5 +9,4 @@
- system.salt.master.formula.pkg.stacklight
- system.salt.master.formula.pkg.monitoring
- system.salt.master.formula.pkg.helm
-- system.salt.master.formula.pkg.ceph
-- system.linux.system.repo.mcp.salt
+- system.salt.master.formula.pkg.ceph
\ No newline at end of file