Merge "Fix gateway nodes location"
diff --git a/apache/server/site/ironic.yml b/apache/server/site/ironic.yml
new file mode 100644
index 0000000..74173a0
--- /dev/null
+++ b/apache/server/site/ironic.yml
@@ -0,0 +1,11 @@
+parameters:
+ apache:
+ server:
+ site:
+ ironic:
+ name: 'ironic'
+ enabled: true
+ type: 'static'
+ root: '/var/www/httproot'
+ host:
+ name: ${linux:system:name}.${linux:system:domain}
diff --git a/designate/server/backend/bind.yml b/designate/server/backend/bind.yml
index 2b40424..c057eb7 100644
--- a/designate/server/backend/bind.yml
+++ b/designate/server/backend/bind.yml
@@ -1,15 +1,18 @@
parameters:
+ _param:
+ designate_bind9_rndc_algorithm: hmac-sha512
designate:
server:
backend:
bind9:
rndc_key: "${_param:designate_bind9_rndc_key}"
+ rndc_algorithm: "${_param:designate_bind9_rndc_algorithm}"
bind:
server:
key:
designate:
secret: "${_param:designate_bind9_rndc_key}"
- algorithm: hmac-sha512
+ algorithm: "${_param:designate_bind9_rndc_algorithm}"
allow_new_zones: true
query: true
control:
@@ -33,4 +36,4 @@
key:
designate:
secret: "${_param:designate_bind9_rndc_key}"
- algorithm: hmac-sha512
+ algorithm: "${_param:designate_bind9_rndc_algorithm}"
diff --git a/docker/swarm/network/runbook.yml b/docker/swarm/network/runbook.yml
new file mode 100644
index 0000000..557b852
--- /dev/null
+++ b/docker/swarm/network/runbook.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ docker_runbook_subnet: 10.40.0.0/24
+ docker:
+ client:
+ network:
+ runbook:
+ subnet: ${_param:docker_runbook_subnet}
+ driver: overlay
+ attachable: true
diff --git a/docker/swarm/stack/dashboard.yml b/docker/swarm/stack/dashboard.yml
index 2ee123b..d3f0391 100644
--- a/docker/swarm/stack/dashboard.yml
+++ b/docker/swarm/stack/dashboard.yml
@@ -5,6 +5,8 @@
grafana_database_host: localhost
grafana_database_port: 3306
grafana_database_password: password
+ grafana_data_directory: /var/lib/grafana
+ grafana_session_life_time: 86400
docker:
client:
stack:
@@ -18,10 +20,16 @@
image: ${_param:docker_image_grafana}
ports:
- 15013:3000
+ volumes:
+ - /srv/volumes/grafana:${_param:grafana_data_directory}
environment:
GF_DATABASE_TYPE: ${_param:grafana_database_type}
GF_DATABASE_NAME: grafana
GF_DATABASE_USER: grafana
GF_DATABASE_PASSWORD: ${_param:grafana_database_password}
GF_DATABASE_HOST: "${_param:grafana_database_host}:${_param:grafana_database_port}"
+ GF_PATHS_DATA: ${_param:grafana_data_directory}
GF_SECURITY_ADMIN_PASSWORD: ${_param:grafana_admin_password}
+ GF_SESSION_PROVIDER: file
+ GF_SESSION_PROVIDER_CONFIG: ${_param:grafana_data_directory}/data/sessions
+ GF_SESSION_LIFE_TIME: ${_param:grafana_session_life_time}
\ No newline at end of file
diff --git a/docker/swarm/stack/devops_portal.yml b/docker/swarm/stack/devops_portal.yml
index 91bca12..430c329 100644
--- a/docker/swarm/stack/devops_portal.yml
+++ b/docker/swarm/stack/devops_portal.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_devops_portal_replicas: 1
- docker_image_devops_portal: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/devops-portal:latest
+ docker_image_devops_portal: docker-prod-virtual.docker.mirantis.net/mirantis/oss/devops-portal:latest
docker:
client:
stack:
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
new file mode 100644
index 0000000..2d5f4a7
--- /dev/null
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ docker_janitor_monkey_replicas: 1
+ docker_image_mongodb: library/mongo:3.4
+ docker_mongodb_admin_username: admin
+ docker_mongodb_admin_password: password
+ docker:
+ client:
+ stack:
+ janitor_monkey:
+ environment:
+ MONGO_INITDB_ROOT_USERNAME: ${_param:docker_mongodb_admin_username}
+ MONGO_INITDB_ROOT_PASSWORD: ${_param:docker_mongodb_admin_password}
+ service:
+ mongodb:
+ image: ${_param:docker_image_mongodb}
+ deploy:
+ replicas: ${_param:docker_janitor_monkey_replicas}
+ restart_policy:
+ condition: any
+ ports:
+ - ${_param:haproxy_mongodb_exposed_port}:${_param:haproxy_mongodb_bind_port}
+ volumes:
+ - /srv/volumes/mongodb:/data
diff --git a/docker/swarm/stack/jenkins/init.yml b/docker/swarm/stack/jenkins/init.yml
new file mode 100644
index 0000000..ab4f07e
--- /dev/null
+++ b/docker/swarm/stack/jenkins/init.yml
@@ -0,0 +1,3 @@
+classes:
+ - system.docker.swarm.stack.jenkins.master
+ - system.docker.swarm.stack.jenkins.slave
diff --git a/docker/swarm/stack/jenkins.yml b/docker/swarm/stack/jenkins/master.yml
similarity index 69%
rename from docker/swarm/stack/jenkins.yml
rename to docker/swarm/stack/jenkins/master.yml
index acea08b..8b66187 100644
--- a/docker/swarm/stack/jenkins.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -5,11 +5,11 @@
client:
stack:
jenkins:
- environment:
- JAVA_OPTS: "-Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com"
- JENKINS_NUM_EXECUTORS: 4
service:
master:
+ environment:
+ JAVA_OPTS: "-Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com"
+ JENKINS_NUM_EXECUTORS: 4
deploy:
restart_policy:
condition: any
diff --git a/docker/swarm/stack/jenkins/slave.yml b/docker/swarm/stack/jenkins/slave.yml
new file mode 100644
index 0000000..52015ec
--- /dev/null
+++ b/docker/swarm/stack/jenkins/slave.yml
@@ -0,0 +1,71 @@
+parameters:
+ _param:
+ docker_image_jenkins_slave: tcpcloud/jnlp-slave
+ jenkins_master_host: ${_param:control_vip_address}
+ jenkins_master_port: 8081
+ jenkins_secret: "7c40abc1a7df2d26dd6b2e4421af17218df75a16fcbd5e3aa6017d9f47eaeabe"
+ jenkins_master_url: http://${_param:jenkins_master_host}:${_param:jenkins_master_port}
+ jenkins_slave_user: ${_param:jenkins_client_user}
+ jenkins_slave_password: ${_param:jenkins_client_password}
+ docker:
+ client:
+ stack:
+ jenkins:
+ service:
+ slave01:
+ environment:
+ JENKINS_URL: ${_param:jenkins_master_url}
+ JENKINS_AGENT_NAME: slave01
+ JENKINS_UPDATE_SLAVE: 'true'
+ JENKINS_LOGIN: ${_param:jenkins_slave_user}
+ JENKINS_PASSWORD: ${_param:jenkins_slave_password}
+ deploy:
+ restart_policy:
+ condition: any
+ placement:
+ constraints:
+ - "node.hostname == ${_param:cluster_node01_name}"
+ image: ${_param:docker_image_jenkins_slave}
+ volumes:
+ - /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
+ - /etc/aptly-publisher.yaml:/etc/aptly-publisher.yaml:ro
+ - /var/run/docker.sock:/var/run/docker.sock
+ - /usr/bin/docker:/usr/bin/docker:ro
+ slave02:
+ environment:
+ JENKINS_URL: ${_param:jenkins_master_url}
+ JENKINS_AGENT_NAME: slave02
+ JENKINS_UPDATE_SLAVE: 'true'
+ JENKINS_LOGIN: ${_param:jenkins_slave_user}
+ JENKINS_PASSWORD: ${_param:jenkins_slave_password}
+ deploy:
+ restart_policy:
+ condition: any
+ placement:
+ constraints:
+ - "node.hostname == ${_param:cluster_node02_name}"
+ image: ${_param:docker_image_jenkins_slave}
+ volumes:
+ - /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
+ - /etc/aptly-publisher.yaml:/etc/aptly-publisher.yaml:ro
+ - /var/run/docker.sock:/var/run/docker.sock
+ - /usr/bin/docker:/usr/bin/docker:ro
+ slave03:
+ environment:
+ JENKINS_URL: ${_param:jenkins_master_url}
+ JENKINS_AGENT_NAME: slave03
+ JENKINS_UPDATE_SLAVE: 'true'
+ JENKINS_LOGIN: ${_param:jenkins_slave_user}
+ JENKINS_PASSWORD: ${_param:jenkins_slave_password}
+ deploy:
+ restart_policy:
+ condition: any
+ placement:
+ constraints:
+ - "node.hostname == ${_param:cluster_node03_name}"
+ image: ${_param:docker_image_jenkins_slave}
+ volumes:
+ - /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
+ - /etc/aptly-publisher.yaml:/etc/aptly-publisher.yaml:ro
+ - /var/run/docker.sock:/var/run/docker.sock
+ - /usr/bin/docker:/usr/bin/docker:ro
diff --git a/docker/swarm/stack/monitoring.yml b/docker/swarm/stack/monitoring.yml
index 4371367..a11024d 100644
--- a/docker/swarm/stack/monitoring.yml
+++ b/docker/swarm/stack/monitoring.yml
@@ -2,6 +2,7 @@
- service.prometheus.server.container
- service.prometheus.alertmanager.container
- service.prometheus.pushgateway.container
+- service.prometheus.remote_storage_adapter.container
- system.prometheus.server
- system.prometheus.alertmanager
parameters:
@@ -15,6 +16,44 @@
driver_opts:
encrypted: 1
service:
+ remote_storage_adapter:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 1
+ labels:
+ com.mirantis.monitoring: "remote_storage_adapter"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "remote_storage_adapter"
+ image: ${_param:docker_image_remote_storage_adapter}
+ ports:
+ - 15015:${prometheus:remote_storage_adapter:bind:port}
+ environment:
+ bind_port: ${prometheus:remote_storage_adapter:bind:port}
+ bind_address: ${prometheus:remote_storage_adapter:bind:address}
+ influxdb_url: ${_param:prometheus_influxdb_url}
+ influxdb_db: ${_param:prometheus_influxdb_db}
+ influxdb_username: ${_param:prometheus_influxdb_username}
+ influxdb_password: ${_param:prometheus_influxdb_password}
+ remote_agent:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 1
+ labels:
+ com.mirantis.monitoring: "remote_agent"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "remote_agent"
+ image: ${_param:docker_image_remote_agent}
+ ports:
+ - 15014:${telegraf:remote_agent:output:prometheus_client:bind:port}
+ volumes:
+ - ${telegraf:remote_agent:dir:config}:/etc/telegraf
+ - ${telegraf:remote_agent:dir:config_d}:/etc/telegraf/telegraf.d
alertmanager:
networks:
- monitoring
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index a4ec24b..322a285 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_rundeck_replicas: 1
- docker_image_rundeck: docker-sandbox.sandbox.mirantis.net/ikharin/oss/rundeck:2.7.3-1
+ docker_image_rundeck: docker-prod-virtual.docker.mirantis.net/mirantis/oss/rundeck:latest
docker:
client:
stack:
diff --git a/docker/swarm/stack/security_monkey.yml b/docker/swarm/stack/security_monkey.yml
index b3b4074..143b321 100644
--- a/docker/swarm/stack/security_monkey.yml
+++ b/docker/swarm/stack/security_monkey.yml
@@ -5,10 +5,11 @@
docker_image_security_monkey_api: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/security-monkey-api:4435
docker_image_security_monkey_scheduler: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/security-monkey-scheduler:4435
security_monkey_db: secmonkey
- notification_service_url: ${_param:haproxy_pushkin_bind_host}:${_param:haproxy_pushkin_bind_port}/post_notification_json
+ notification_service_url: http://${_param:haproxy_pushkin_bind_host}:${_param:haproxy_pushkin_bind_port}/post_notification_json
security_monkey_user: devopsportal@devopsportal.local
security_monkey_password: devopsportal
security_monkey_role: Justify
+ devops_portal_sm_wtf_csrf_enabled: False
security_monkey_openstack:
os_account_id: mcp_cloud
os_account_name: mcp_cloud
@@ -39,6 +40,7 @@
OS_PROJECT_DOMAIN_NAME: ${_param:security_monkey_openstack:project_domain_name}
OS_PROJECT_NAME: ${_param:security_monkey_openstack:project_name}
USER_DOMAIN_NAME: ${_param:security_monkey_openstack:user_domain_name}
+ SM_WTF_CSRF_ENABLED: ${_param:devops_portal_sm_wtf_csrf_enabled}
service:
api:
image: ${_param:docker_image_security_monkey_api}
diff --git a/elasticsearch/client/pushkin/init.yml b/elasticsearch/client/pushkin/init.yml
new file mode 100644
index 0000000..217f1c8
--- /dev/null
+++ b/elasticsearch/client/pushkin/init.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ pushkin_elasticsearch_host: ${_param:haproxy_elasticsearch_bind_host}
+ pushkin_elasticsearch_port: ${_param:haproxy_elasticsearch_bind_port}
+ elasticsearch:
+ client:
+ enabled: true
+ server:
+ host: ${_param:pushkin_elasticsearch_host}
+ port: ${_param:pushkin_elasticsearch_port}
\ No newline at end of file
diff --git a/elasticsearch/client/pushkin/notifications.yml b/elasticsearch/client/pushkin/notifications.yml
new file mode 100644
index 0000000..1d17c77
--- /dev/null
+++ b/elasticsearch/client/pushkin/notifications.yml
@@ -0,0 +1,42 @@
+parameters:
+ _param:
+ pushkin_notifications_shards: 5
+ pushkin_notifications_replicas: 1
+ elasticsearch:
+ client:
+ index:
+ notifications:
+ enabled: true
+ force_operation: true
+ definition:
+ template: notifications
+ settings:
+ number_of_shards: ${_param:pushkin_notifications_shards}
+ number_of_replicas: ${_param:pushkin_notifications_replicas}
+ mappings:
+ notification:
+ properties:
+ applicationId:
+ type: long
+ content:
+ type: text
+ fields:
+ keyword:
+ type: keyword
+ ignore_above: 256
+ level:
+ type: text
+ fields:
+ keyword:
+ type: keyword
+ ignore_above: 256
+ read:
+ type: boolean
+ timestamp:
+ type: date
+ title:
+ type: text
+ fields:
+ keyword:
+ type: keyword
+ ignore_above: 256
\ No newline at end of file
diff --git a/galera/server/database/ironic.yml b/galera/server/database/ironic.yml
new file mode 100644
index 0000000..8cb14a3
--- /dev/null
+++ b/galera/server/database/ironic.yml
@@ -0,0 +1,15 @@
+parameters:
+ mysql:
+ server:
+ database:
+ ironic:
+ encoding: utf8
+ users:
+ - name: ironic
+ password: ${_param:mysql_ironic_password}
+ host: '%'
+ rights: all
+ - name: ironic
+ password: ${_param:mysql_ironic_password}
+ host: ${_param:cluster_local_address}
+ rights: all
diff --git a/glusterfs/client/volume/grafana.yml b/glusterfs/client/volume/grafana.yml
new file mode 100644
index 0000000..bd939c1
--- /dev/null
+++ b/glusterfs/client/volume/grafana.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ grafana_glusterfs_service_host: ${_param:glusterfs_service_host}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ glusterfs:
+ client:
+ volumes:
+ grafana:
+ path: /srv/volumes/grafana
+ server: ${_param:grafana_glusterfs_service_host}
+ opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/glusterfs/client/volume/mongodb.yml b/glusterfs/client/volume/mongodb.yml
new file mode 100644
index 0000000..1b2fd4f
--- /dev/null
+++ b/glusterfs/client/volume/mongodb.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ mongodb_glusterfs_service_host: ${_param:glusterfs_service_host}
+ mongodb_glusterfs_node01_address: ${_param:cluster_node01_address}
+ mongodb_glusterfs_node02_address: ${_param:cluster_node02_address}
+ mongodb_glusterfs_node03_address: ${_param:cluster_node03_address}
+ glusterfs:
+ client:
+ volumes:
+ mongodb:
+ path: /srv/volumes/mongodb
+ server: ${_param:mongodb_glusterfs_service_host}
+ opts: "defaults,backup-volfile-servers=${_param:mongodb_glusterfs_node01_address}:${_param:mongodb_glusterfs_node02_address}:${_param:mongodb_glusterfs_node03_address}"
diff --git a/glusterfs/server/volume/grafana.yml b/glusterfs/server/volume/grafana.yml
new file mode 100644
index 0000000..f099c99
--- /dev/null
+++ b/glusterfs/server/volume/grafana.yml
@@ -0,0 +1,17 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ grafana:
+ storage: /srv/glusterfs/grafana
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/grafana
+ - ${_param:cluster_node02_address}:/srv/glusterfs/grafana
+ - ${_param:cluster_node03_address}:/srv/glusterfs/grafana
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
diff --git a/glusterfs/server/volume/mongodb.yml b/glusterfs/server/volume/mongodb.yml
new file mode 100644
index 0000000..a9c69f7
--- /dev/null
+++ b/glusterfs/server/volume/mongodb.yml
@@ -0,0 +1,17 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ mongodb:
+ storage: /srv/glusterfs/mongodb
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/mongodb
+ - ${_param:cluster_node02_address}:/srv/glusterfs/mongodb
+ - ${_param:cluster_node03_address}:/srv/glusterfs/mongodb
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
diff --git a/haproxy/proxy/listen/kubernetes/apiserver.yml b/haproxy/proxy/listen/kubernetes/apiserver.yml
index a45a71a..b35d1be 100644
--- a/haproxy/proxy/listen/kubernetes/apiserver.yml
+++ b/haproxy/proxy/listen/kubernetes/apiserver.yml
@@ -21,4 +21,7 @@
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 443
- params: check
\ No newline at end of file
+ params: check
+ timeout:
+ server: 10m
+ client: 10m
diff --git a/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml b/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml
index a365c51..7211507 100644
--- a/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml
+++ b/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml
@@ -20,6 +20,9 @@
host: ${_param:cluster_node03_address}
port: 8080
params: check
+ timeout:
+ server: 10m
+ client: 10m
k8s_cluster_localhost:
type: kubernetes
binds:
@@ -37,4 +40,7 @@
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8080
- params: check
\ No newline at end of file
+ params: check
+ timeout:
+ server: 10m
+ client: 10m
diff --git a/haproxy/proxy/listen/mysql.yml b/haproxy/proxy/listen/mysql.yml
index a7ef910..40a9f35 100644
--- a/haproxy/proxy/listen/mysql.yml
+++ b/haproxy/proxy/listen/mysql.yml
@@ -7,7 +7,7 @@
listen:
mysql:
mode: tcp
- balance: source
+ balance: first
binds:
- address: ${_param:haproxy_bind_address}
port: ${_param:haproxy_mysql_bind_port}
diff --git a/haproxy/proxy/listen/openstack/galera.yml b/haproxy/proxy/listen/openstack/galera.yml
index 254dc3b..7298cfc 100644
--- a/haproxy/proxy/listen/openstack/galera.yml
+++ b/haproxy/proxy/listen/openstack/galera.yml
@@ -11,6 +11,7 @@
mysql_cluster:
type: mysql
service_name: mysql
+ balance: first
binds:
- address: ${_param:cluster_vip_address}
port: 3306
diff --git a/haproxy/proxy/listen/openstack/ironic.yml b/haproxy/proxy/listen/openstack/ironic.yml
new file mode 100644
index 0000000..221a9cc
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/ironic.yml
@@ -0,0 +1,25 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ ironic:
+ type: general-service
+ service_name: ironic
+ check: false
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 6385
+ servers:
+ - name: ctl01
+ host: ${_param:cluster_node01_address}
+ port: 6385
+ params: check
+ - name: ctl02
+ host: ${_param:cluster_node02_address}
+ port: 6385
+ params: check
+ - name: ctl03
+ host: ${_param:cluster_node03_address}
+ port: 6385
+ params: check
+
diff --git a/haproxy/proxy/listen/openstack/ironic_deploy.yml b/haproxy/proxy/listen/openstack/ironic_deploy.yml
new file mode 100644
index 0000000..f5e7a4f
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/ironic_deploy.yml
@@ -0,0 +1,24 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ ironic_deploy:
+ type: general-service
+ service_name: ironic_deploy
+ check: false
+ binds:
+ - address: ${_param:cluster_baremetal_vip_address}
+ port: 6385
+ servers:
+ - name: bmt01
+ host: ${_param:openstack_baremetal_node01_baremetal_address}
+ port: 6385
+ params: check
+ - name: bmt02
+ host: ${_param:openstack_baremetal_node02_baremetal_address}
+ port: 6385
+ params: check
+ - name: bmt03
+ host: ${_param:openstack_baremetal_node03_baremetal_address}
+ port: 6385
+ params: check
diff --git a/haproxy/proxy/listen/oss/mongodb.yml b/haproxy/proxy/listen/oss/mongodb.yml
new file mode 100644
index 0000000..d4086cd
--- /dev/null
+++ b/haproxy/proxy/listen/oss/mongodb.yml
@@ -0,0 +1,51 @@
+parameters:
+ _param:
+ haproxy_mongodb_bind_host: ${_param:haproxy_bind_address}
+ haproxy_mongodb_bind_port: 27017
+ haproxy_mongodb_exposed_port: 37017
+ haproxy_mongodb_ssl:
+ enabled: false
+ haproxy:
+ proxy:
+ listen:
+ mongodb:
+ mode: tcp
+ balance: source
+ options:
+ - tcp-check
+ health-check:
+ tcp:
+ enabled: true
+ options:
+ - send-binary 39000000 # Message Length (57)
+ - send-binary EEEEEEEE # Request ID (random value)
+ - send-binary 00000000 # Response To (nothing)
+ - send-binary d4070000 # OpCode (Query)
+ - send-binary 00000000 # Query Flags
+ - send-binary 746573742e # fullCollectionName (test.$cmd)
+ - send-binary 24636d6400 # continued
+ - send-binary 00000000 # NumToSkip
+ - send-binary FFFFFFFF # NumToReturn
+ - send-binary 13000000 # Document Length (19)
+ - send-binary 01 # Type (Double)
+ - send-binary 70696e6700 # Ping:
+ - send-binary 000000000000f03f # Value : 1
+ - send-binary 00 # Term
+ - expect string ok
+ binds:
+ - address: ${_param:haproxy_mongodb_bind_host}
+ port: ${_param:haproxy_mongodb_bind_port}
+ ssl: ${_param:haproxy_mongodb_ssl}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: ${_param:haproxy_mongodb_exposed_port}
+ params: check port ${_param:haproxy_mongodb_exposed_port}
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: ${_param:haproxy_mongodb_exposed_port}
+ params: backup check port ${_param:haproxy_mongodb_exposed_port}
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: ${_param:haproxy_mongodb_exposed_port}
+ params: backup check port ${_param:haproxy_mongodb_exposed_port}
diff --git a/horizon/server/plugin/lbaasv2.yml b/horizon/server/plugin/lbaasv2.yml
new file mode 100644
index 0000000..69e2682
--- /dev/null
+++ b/horizon/server/plugin/lbaasv2.yml
@@ -0,0 +1,9 @@
+parameters:
+ horizon:
+ server:
+ plugin:
+ lbaasv2:
+ source:
+ engine: pkg
+ name: python-horizon-neutron-lbaasv2-panel
+
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
new file mode 100644
index 0000000..c3a7901
--- /dev/null
+++ b/ironic/api/cluster.yml
@@ -0,0 +1,9 @@
+classes:
+- service.ironic.api.cluster
+parameters:
+ ironic:
+ api:
+ enabled: true
+ version: ${_param:ironic_version}
+ bind:
+ address: ${_param:cluster_baremetal_local_address}
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
new file mode 100644
index 0000000..0800579
--- /dev/null
+++ b/ironic/api/single.yml
@@ -0,0 +1,7 @@
+classes:
+- service.ironic.api.single
+parameters:
+ ironic:
+ api:
+ bind:
+ address: ${_param:single_address}
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
new file mode 100644
index 0000000..43e870c
--- /dev/null
+++ b/ironic/conductor/cluster.yml
@@ -0,0 +1,6 @@
+classes:
+- service.ironic.conductor.cluster
+parameters:
+ ironic:
+ conductor:
+ api_url: 'http://${_param:cluster_baremetal_vip_address}'
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
new file mode 100644
index 0000000..69e6c20
--- /dev/null
+++ b/ironic/conductor/single.yml
@@ -0,0 +1,7 @@
+classes:
+- service.ironic.conductor.single
+parameters:
+ ironic:
+ conductor:
+ enabled: true
+ version: ${_param:ironic_version}
diff --git a/ironic/tftpd_hpa.yml b/ironic/tftpd_hpa.yml
new file mode 100644
index 0000000..fc1dd74
--- /dev/null
+++ b/ironic/tftpd_hpa.yml
@@ -0,0 +1,14 @@
+classes:
+ - service.tftpd_hpa.server.single
+parameters:
+ tftpd_hpa:
+ server:
+ enabled: true
+ bind:
+ address: '0.0.0.0'
+ port: 69
+ username: 'ironic'
+ path: /var/lib/tftpboot
+ options:
+ - secure
+ - map-file: '/var/lib/tftpboot/map-file'
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index c902f32..fe50cd6 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -145,6 +145,14 @@
dist: xenial
build: libvirt-exporter
branch: master
+ - package: kafka
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: python-cassandra-driver
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
template:
type: workflow-scm
concurrent: false
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index 0df27ad..d3deab7 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -18,6 +18,18 @@
os_version: ocata
branch: stable/ocata
# Trusty
+ - name: horizon-neutron-lbaasv2-panel
+ os: ubuntu
+ dist: trusty
+ os_version: mitaka
+ branch: stable/mitaka
+ # Xenial
+ - name: horizon-neutron-lbaasv2-panel
+ os: ubuntu
+ dist: xenial
+ os_version: mitaka
+ branch: stable/mitaka
+ # Trusty
- name: horizon-overrides-plugin
os: ubuntu
dist: trusty
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index d216e9d..a57a8ab 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -117,4 +117,4 @@
default: 'true'
UPLOAD_APTLY:
type: boolean
- default: 'true'
\ No newline at end of file
+ default: 'true'
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 0eec086..c5a6709 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -79,6 +79,8 @@
dist: trusty
- name: iptables
dist: trusty
+ - name: ironic
+ dist: trusty
- name: isc-dhcp
dist: trusty
- name: java
@@ -129,6 +131,8 @@
dist: trusty
- name: ntp
dist: trusty
+ - name: octavia
+ dist: trusty
- name: opencontrail
dist: trusty
- name: openldap
@@ -145,6 +149,8 @@
dist: trusty
- name: postgresql
dist: trusty
+ - name: powerdns
+ dist: trusty
- name: pritunl
dist: trusty
- name: prometheus
@@ -255,6 +261,8 @@
dist: xenial
- name: glusterfs
dist: xenial
+ - name: gnocchi
+ dist: xenial
- name: grafana
dist: xenial
- name: graphite
@@ -267,6 +275,8 @@
dist: xenial
- name: iptables
dist: xenial
+ - name: ironic
+ dist: xenial
- name: isc-dhcp
dist: xenial
- name: java
@@ -317,6 +327,8 @@
dist: xenial
- name: ntp
dist: xenial
+ - name: octavia
+ dist: xenial
- name: opencontrail
dist: xenial
- name: openldap
@@ -329,6 +341,8 @@
dist: xenial
- name: owncloud
dist: xenial
+ - name: panko
+ dist: xenial
- name: postfix
dist: xenial
- name: postgresql
@@ -337,6 +351,8 @@
dist: xenial
- name: prometheus
dist: xenial
+ - name: powerdns
+ dist: xenial
- name: python
dist: xenial
- name: rabbitmq
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index d2bd1f7..fb1dd92 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -75,9 +75,15 @@
OPENSTACK_API_VERSION:
type: string
default: "2"
- OPENSTACK_API_PROJECT_DOMAIN_ID:
+ OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
OPENSTACK_API_USER_DOMAIN_ID:
type: string
default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
diff --git a/jenkins/client/job/deploy/lab/mk/cleanup.yml b/jenkins/client/job/deploy/lab/mk/cleanup.yml
index 687e1f3..a400842 100644
--- a/jenkins/client/job/deploy/lab/mk/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/mk/cleanup.yml
@@ -42,10 +42,13 @@
OPENSTACK_API_VERSION:
type: string
default: "2"
- OPENSTACK_API_PROJECT_DOMAIN_ID:
+ OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
- OPENSTACK_API_USER_DOMAIN_ID:
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
type: string
default: "default"
@@ -89,9 +92,15 @@
OPENSTACK_API_VERSION:
type: string
default: "2"
- OPENSTACK_API_PROJECT_DOMAIN_ID:
+ OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
OPENSTACK_API_USER_DOMAIN_ID:
type: string
default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index 32542ca..a79414b 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -59,6 +59,9 @@
STACK_REUSE:
type: boolean
default: 'false'
+ STACK_COMPUTE_COUNT:
+ type: string
+ default: '2'
STACK_TEMPLATE_URL:
type: string
@@ -109,12 +112,18 @@
OPENSTACK_API_VERSION:
type: string
default: "2"
- OPENSTACK_API_PROJECT_DOMAIN_ID:
+ OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
OPENSTACK_API_USER_DOMAIN_ID:
type: string
default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
# heat
HEAT_STACK_ENVIRONMENT:
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index c9833ef..1ddd863 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -58,7 +58,7 @@
default: 'false'
STACK_CLEANUP_JOB:
type: string
- default: 'deploy-heat-cleanup'
+ default: 'deploy-stack-cleanup'
# heat
HEAT_STACK_ENVIRONMENT:
type: string
@@ -103,7 +103,7 @@
OPENSTACK_USER_DOMAIN:
type: string
default: "default"
- OPENSTACK_API_USER_DOMAIN_ID:
+ OPENSTACK_API_USER_DOMAIN:
type: string
default: "default"
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml
index cad1182..c2eb71b 100644
--- a/jenkins/client/job/deploy/openstack.yml
+++ b/jenkins/client/job/deploy/openstack.yml
@@ -34,3 +34,23 @@
ASK_ON_ERROR:
type: boolean
default: 'false'
+ deploy-openstack-compute:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - OpenStack Compute node"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: openstack-compute-install.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ TARGET_SERVERS:
+ type: string
+ default: ""
+ description: "Salt compound target to match nodes to be updated [*, G@osfamily:debian]."
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index a65d440..ba3383a 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -3,3 +3,5 @@
- system.jenkins.client.job.deploy.update.config
- system.jenkins.client.job.deploy.update.saltenv
- system.jenkins.client.job.deploy.update.upgrade
+ - system.jenkins.client.job.deploy.update.upgrade_compute
+ - system.jenkins.client.job.deploy.update.restore_mysql
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/update/package.yml b/jenkins/client/job/deploy/update/package.yml
index 273796c..a4e7fc0 100644
--- a/jenkins/client/job/deploy/update/package.yml
+++ b/jenkins/client/job/deploy/update/package.yml
@@ -36,7 +36,7 @@
TARGET_SUBSET_LIVE:
type: string
default: '1'
- description: Number of selected noded to live apply selected package update.
+ description: Number of selected nodes to live apply selected package update.
TARGET_BATCH_LIVE:
type: string
description: Batch size for the complete live package update on all nodes, empty string means apply to all targetted nodes.
diff --git a/jenkins/client/job/deploy/update/restore_mysql.yml b/jenkins/client/job/deploy/update/restore_mysql.yml
new file mode 100644
index 0000000..9b2e4d7
--- /dev/null
+++ b/jenkins/client/job/deploy/update/restore_mysql.yml
@@ -0,0 +1,26 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy-mysql-db-restore:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Xtrabackup - restore mysql db"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: xtrabackup-restore-mysql-db.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+
diff --git a/jenkins/client/job/deploy/update/saltenv.yml b/jenkins/client/job/deploy/update/saltenv.yml
index 397e3f3..1ce1494 100644
--- a/jenkins/client/job/deploy/update/saltenv.yml
+++ b/jenkins/client/job/deploy/update/saltenv.yml
@@ -5,6 +5,7 @@
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
jenkins_salt_model_name: "salt"
+ jenkins_salt_model_branch: "master"
jenkins:
client:
job_template:
@@ -21,6 +22,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
+ branch: ${_param:jenkins_salt_model_branch}
credentials: "gerrit"
script: Jenkinsfile
param:
diff --git a/jenkins/client/job/deploy/update/upgrade_compute.yml b/jenkins/client/job/deploy/update/upgrade_compute.yml
new file mode 100644
index 0000000..0d7ea78
--- /dev/null
+++ b/jenkins/client/job/deploy/update/upgrade_compute.yml
@@ -0,0 +1,42 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy-update-package:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - upgrade computes"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: openstack-compute-upgrade.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ TARGET_SERVERS:
+ type: string
+ default: "*"
+ description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
+ TARGET_PACKAGES:
+ type: string
+ description: Space delimited list of packages to be updates [package1=version package2=version], empty string means all updating all packages to the latest version.
+ TARGET_SUBSET_TEST:
+ type: string
+ description: Number of nodes to list package updates, empty string means all targetted nodes.
+ TARGET_SUBSET_LIVE:
+ type: string
+ default: '1'
+ description: Number of selected nodes to live apply selected package update.
+ TARGET_BATCH_LIVE:
+ type: string
+ description: Batch size for the complete live package update on all nodes, empty string means apply to all targetted nodes.
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index cd8a132..27e3117 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -49,6 +49,18 @@
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
+ - buildname: oc323
+ os: ubuntu
+ dist: trusty
+ branch: R3.2.3.x
+ ppa: mirantis-opencontrail/opencontrail-3.2.3
+ upload_source_package: true
+ - buildname: oc323
+ os: ubuntu
+ dist: xenial
+ branch: R3.2.3.x
+ ppa: mirantis-opencontrail/opencontrail-3.2.3
+ upload_source_package: true
- buildname: oc40
os: ubuntu
dist: trusty
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 5a4666a..9b66e60 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -62,15 +62,13 @@
branches:
- "{{branch}}"
event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
+ comment:
+ - added:
+ verdictCategory: 'Code-Review'
+ commentAddedTriggerApprovalValue: '+1'
- addedContains:
commentAddedCommentContains: '(recheck|reverify)'
param:
TEST_MODELS:
type: string
- default: "{{clusters}}"
\ No newline at end of file
+ default: "{{clusters}}"
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index e76b322..85ca57b 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -3,12 +3,12 @@
- system.jenkins.client.job.opencontrail.git-mirrors
parameters:
_param:
- contrail_branches: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R4.0,master"
+ contrail_branches: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,master"
contrail_kubernetes_branches: "master,release-1.2"
contrail_dpdk_extra_branches: "mitaka,kilo,liberty-multiqueue,newton"
contrail_ceilometer_plugin_branches: "master,R4.0"
contrail_kubernetes_branches: "master,origin-1.1,origin-1.1.3,release-1.1,release-1.2"
- contrail_dpdk_branches: "master,R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R4.0,contrail_dpdk_17_02,contrail_dpdk_1_7,contrail_dpdk_2_0,contrail_dpdk_2_1"
+ contrail_dpdk_branches: "master,R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,contrail_dpdk_17_02,contrail_dpdk_1_7,contrail_dpdk_2_0,contrail_dpdk_2_1"
jenkins:
client:
view:
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 3869b4a..a170ba9 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -40,6 +40,7 @@
- name: gitlab
- name: glance
- name: glusterfs
+ - name: gnocchi
- name: grafana
- name: graphite
- name: haproxy
@@ -48,6 +49,7 @@
- name: horizon
- name: influxdb
- name: iptables
+ - name: ironic
- name: isc-dhcp
- name: java
- name: jenkins
@@ -77,14 +79,17 @@
- name: nodejs
- name: nova
- name: ntp
+ - name: octavia
- name: opencontrail
- name: openldap
- name: openssh
- name: openvpn
- name: openvstorage
- name: owncloud
+ - name: panko
- name: postfix
- name: postgresql
+ - name: powerdns
- name: pritunl
- name: prometheus
- name: python
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 1e51afb..60f4f3f 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -39,6 +39,7 @@
- name: gitlab
- name: glance
- name: glusterfs
+ - name: gnocchi
- name: grafana
- name: graphite
- name: haproxy
@@ -47,6 +48,7 @@
- name: horizon
- name: influxdb
- name: iptables
+ - name: ironic
- name: isc-dhcp
- name: java
- name: jenkins
@@ -76,14 +78,17 @@
- name: nodejs
- name: nova
- name: ntp
+ - name: octavia
- name: opencontrail
- name: openldap
- name: openssh
- name: openvpn
- name: openvstorage
- name: owncloud
+ - name: panko
- name: postfix
- name: postgresql
+ - name: powerdns
- name: pritunl
- name: prometheus
- name: python
@@ -129,12 +134,10 @@
branches:
- master
event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
comment:
+ - added:
+ verdictCategory: 'Code-Review'
+ commentAddedTriggerApprovalValue: '+1'
- addedContains:
commentAddedCommentContains: '(recheck|reverify)'
param:
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 8202479..587b3c4 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -46,4 +46,4 @@
type: string
TEST_MODEL:
type: boolean
- default: true
+ default: false
diff --git a/jenkins/client/job/salt-models/git-mirrors.yml b/jenkins/client/job/salt-models/git-mirrors.yml
index 514663b..034f8d5 100644
--- a/jenkins/client/job/salt-models/git-mirrors.yml
+++ b/jenkins/client/job/salt-models/git-mirrors.yml
@@ -6,37 +6,6 @@
job_template:
git_mirror_2way_salt_model:
name: git-mirror-2way-salt-model-{{name}}
- jobs:
- - name: reclass-system
- upstream_name: reclass-system
- branches: "master"
- - name: slovaktelekom
- upstream_name: slovaktelekom
- branches: "master"
- - name: stacklight
- upstream_name: stacklight
- branches: "master"
- - name: statens
- upstream_name: statensit
- branches: "master"
- - name: aeg
- upstream_name: aeg
- branches: "master"
- - name: att-cicd
- upstream_name: att-cicd
- branches: "master"
- - name: mall
- upstream_name: mall
- branches: "master"
- - name: quickplay
- upstream_name: quickplay
- branches: "master"
- - name: ril-jamnagar
- upstream_name: ril-jamnagar-lab
- branches: "master,jlab,next"
- - name: vf-cloudstore
- upstream_name: vf-cloudstore
- branches: "master"
template:
type: workflow-scm
concurrent: false
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 3b5f647..dadd255 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -6,35 +6,6 @@
job_template:
test_salt_model:
name: test-salt-model-{{name}}
- jobs:
- - name: aeg
- extra_formulas: ""
- - name: att-cicd
- extra_formulas: ""
- - name: mall
- extra_formulas: ""
- - name: mcp-baremetal-lab
- extra_formulas: ""
- - name: mcp-virtual-lab
- extra_formulas: "prometheus telegraf"
- - name: mk-ci
- extra_formulas: ""
- - name: qa
- extra_formulas: ""
- - name: quickplay
- extra_formulas: ""
- - name: ril-jamnagar
- extra_formulas: ""
- - name: slovaktelekom
- extra_formulas: ""
- - name: stacklight
- extra_formulas: ""
- - name: statens
- extra_formulas: ""
- - name: training
- extra_formulas: ""
- - name: vf-cloudstore
- extra_formulas: ""
template:
type: workflow-scm
scm:
@@ -48,14 +19,13 @@
project:
salt-models/{{name}}:
branches:
- - master
+ - compare_type: "REG_EXP"
+ name: "{{branch}}"
event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
comment:
+ - added:
+ verdictCategory: 'Code-Review'
+ commentAddedTriggerApprovalValue: '+1'
- addedContains:
commentAddedCommentContains: '(recheck|reverify)'
param:
@@ -81,9 +51,6 @@
default: "{{extra_formulas}}"
test_system_reclass:
name: test-salt-model-{{name}}
- jobs:
- - name: reclass-system
- clusters: "mcp-baremetal-lab,mcp-virtual-lab,qa,stacklight,training"
template:
type: workflow-scm
scm:
@@ -134,12 +101,10 @@
branches:
- master
event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
comment:
+ - added:
+ verdictCategory: 'CodeReview'
+ commentAddedTriggerApprovalValue: '+1'
- addedContains:
commentAddedCommentContains: '(recheck|reverify)'
param:
@@ -161,3 +126,6 @@
PARALLEL_NODE_GROUP_SIZE:
type: string
default: "1"
+ EXTRA_FORMULAS:
+ type: string
+ default: "xtrabackup"
diff --git a/jenkins/client/node.yml b/jenkins/client/node.yml
new file mode 100644
index 0000000..321951a
--- /dev/null
+++ b/jenkins/client/node.yml
@@ -0,0 +1,47 @@
+parameters:
+ _param:
+ jenkins_slave_executors: 4
+ jenkins:
+ client:
+ node:
+ master:
+ node_mode: Exclusive
+ remote_home: /var/lib/jenkins
+ launcher:
+ type: master
+ slave01:
+ remote_home: /var/lib/jenkins
+ desc: ""
+ num_executors: ${_param:jenkins_slave_executors}
+ node_mode: Normal
+ ret_strategy: Always
+ labels:
+ - python
+ - test
+ - docker
+ launcher:
+ type: jnlp
+ slave02:
+ remote_home: /var/lib/jenkins
+ desc: ""
+ num_executors: ${_param:jenkins_slave_executors}
+ node_mode: Normal
+ ret_strategy: Always
+ labels:
+ - python
+ - test
+ - docker
+ launcher:
+ type: jnlp
+ slave03:
+ remote_home: /var/lib/jenkins
+ desc: ""
+ num_executors: ${_param:jenkins_slave_executors}
+ node_mode: Normal
+ ret_strategy: Always
+ labels:
+ - python
+ - test
+ - docker
+ launcher:
+ type: jnlp
diff --git a/jenkins/client/security/matrix.yml b/jenkins/client/security/matrix.yml
index b08aefd..a0ecc1e 100644
--- a/jenkins/client/security/matrix.yml
+++ b/jenkins/client/security/matrix.yml
@@ -5,9 +5,11 @@
- ${_param:jenkins_client_user}
- admins
# Read only access
- jenkins_security_matrix_read: []
+ jenkins_security_matrix_read:
+ - mirantis
# Read + permissions to build jobs
- jenkins_security_matrix_build: []
+ jenkins_security_matrix_build:
+ - mirantis
# Build permissions + create/delete, whatever.
jenkins_security_matrix_write:
- ${_param:jenkins_client_user}
diff --git a/keepalived/cluster/instance/openstack_baremetal_vip.yml b/keepalived/cluster/instance/openstack_baremetal_vip.yml
new file mode 100644
index 0000000..c3141b6
--- /dev/null
+++ b/keepalived/cluster/instance/openstack_baremetal_vip.yml
@@ -0,0 +1,21 @@
+applications:
+- keepalived
+classes:
+- service.keepalived.support
+parameters:
+ _param:
+ keepalived_openstack_baremetal_vip_address: ${_param:cluster_baremetal_vip_address}
+ keepalived_openstack_baremetal_password: password
+ keepalived_openstack_baremetal_vip_interface: eth1
+ keepalived_openstack_baremetal_vip_virtual_router_id: 132
+ keepalived_openstack_baremetal_vip_priority: ${_param:keepalived_vip_priority}
+ keepalived:
+ cluster:
+ enabled: true
+ instance:
+ openstack_baremetal_vip:
+ address: ${_param:keepalived_openstack_baremetal_vip_address}
+ password: ${_param:keepalived_openstack_baremetal_password}
+ interface: ${_param:keepalived_openstack_baremetal_vip_interface}
+ virtual_router_id: ${_param:keepalived_openstack_baremetal_vip_virtual_router_id}
+ priority: ${_param:keepalived_openstack_baremetal_vip_priority}
diff --git a/keystone/client/core.yml b/keystone/client/core.yml
new file mode 100644
index 0000000..0614f40
--- /dev/null
+++ b/keystone/client/core.yml
@@ -0,0 +1,32 @@
+parameters:
+ linux:
+ system:
+ job:
+ keystone_job_rotate:
+ command: '/usr/bin/keystone-manage fernet_rotate --keystone-user keystone --keystone-group keystone >> /var/log/key_rotation_log 2>> /var/log/key_rotation_log'
+ enabled: true
+ user: root
+ minute: 0
+ keystone:
+ client:
+ enabled: true
+ server:
+ identity:
+ admin:
+ host: ${_param:keystone_service_host}
+ port: 35357
+ token: ${_param:keystone_service_token}
+ roles:
+ - admin
+ - Member
+ project:
+ service:
+ description: "OpenStack Service tenant"
+ admin:
+ description: "OpenStack Admin tenant"
+ user:
+ admin:
+ is_admin: true
+ password: ${_param:keystone_admin_password}
+ email: ${_param:admin_email}
+
diff --git a/keystone/client/service/ironic.yml b/keystone/client/service/ironic.yml
new file mode 100644
index 0000000..7635e2c
--- /dev/null
+++ b/keystone/client/service/ironic.yml
@@ -0,0 +1,30 @@
+parameters:
+ _param:
+ cluster_public_protocol: https
+ keystone:
+ client:
+ server:
+ identity:
+ project:
+ service:
+ user:
+ ironic:
+ is_admin: true
+ password: ${_param:keystone_ironic_password}
+ email: ${_param:admin_email}
+ service:
+ ironic:
+ type: baremetal
+ description: OpenStack Baremetal Service
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:cluster_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 6385
+ public_path: ''
+ internal_address: ${_param:ironic_service_host}
+ internal_port: 6385
+ internal_path: ''
+ admin_address: ${_param:ironic_service_host}
+ admin_port: 6385
+ admin_path: ''
diff --git a/keystone/client/service/keystone3.yml b/keystone/client/service/keystone3.yml
index 9dd9eef..cc385f2 100644
--- a/keystone/client/service/keystone3.yml
+++ b/keystone/client/service/keystone3.yml
@@ -6,7 +6,7 @@
server:
identity:
service:
- keystone3:
+ keystone:
type: identity
description: OpenStack Identity Service v3
endpoints:
diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index 9c7547e..3bf9b27 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ radosgw_swift_cluster_port: 8081
keystone:
client:
server:
@@ -20,11 +21,11 @@
- region: ${_param:openstack_region}
public_address: ${_param:cluster_public_host}
public_protocol: ${_param:cluster_public_protocol}
- public_port: 8081
+ public_port: ${_param:radosgw_swift_cluster_port}
public_path: '/swift/v1' # /$(project_id)s
internal_address: ${_param:radosgw_service_host}
- internal_port: 8081
+ internal_port: ${_param:radosgw_swift_cluster_port}
internal_path: '/swift/v1'
admin_address: ${_param:radosgw_service_host}
- admin_port: 8081
+ admin_port: ${_param:radosgw_swift_cluster_port}
admin_path: '/swift/v1'
diff --git a/maas/region/single.yml b/maas/region/single.yml
index 569d475..d3227ca 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -2,15 +2,42 @@
- service.maas.region.single
- service.maas.region.vendor_repo
parameters:
+ _param:
+ maas_admin_username: mirantis
maas:
+ cluster:
+ enabled: true
+ role: master
+ region:
+ host: ${_param:single_address}
+ port: 5242
region:
+ salt_master_ip: ${_param:infra_config_deploy_address}
theme: mirantis
enable_iframe: True
bind:
- host: ${_param:cluster_vip_address}
+ host: ${_param:single_address}
+ admin:
+ username: ${_param:maas_admin_username}
+ password: ${_param:maas_admin_password}
+ email: email@example.com
database:
engine: postgresql
- host: 10.0.175.10
+ host: localhost
name: maasdb
- password: password
- username: maas
\ No newline at end of file
+ password: ${_param:maas_db_password}
+ username: maas
+ maas_config:
+ commissioning_distro_series: xenial
+ default_distro_series: xenial
+ default_osystem: 'ubuntu'
+ default_storage_layout: lvm
+ disk_erase_with_secure_erase: true
+ dnssec_validation: 'no'
+ enable_third_party_drivers: true
+ maas_name: mas01
+ active_discovery_interval: '600'
+ ntp_external_only: true
+ upstream_dns: ${_param:dns_server01}
+ enable_http_proxy: false
+ default_min_hwe_kernel: ''
diff --git a/mysql/client/database/ironic.yml b/mysql/client/database/ironic.yml
new file mode 100644
index 0000000..e142e64
--- /dev/null
+++ b/mysql/client/database/ironic.yml
@@ -0,0 +1,18 @@
+parameters:
+ mysql:
+ client:
+ server:
+ database:
+ database:
+ ironic:
+ encoding: utf8
+ users:
+ - name: ironic
+ password: ${_param:mysql_ironic_password}
+ host: '%'
+ rights: all
+ - name: ironic
+ password: ${_param:mysql_ironic_password}
+ host: ${_param:cluster_local_address}
+ rights: all
+
diff --git a/neutron/client/service/ironic.yml b/neutron/client/service/ironic.yml
new file mode 100644
index 0000000..c400f96
--- /dev/null
+++ b/neutron/client/service/ironic.yml
@@ -0,0 +1,19 @@
+parameters:
+ neutron:
+ client:
+ enabled: true
+ server:
+ admin_identity:
+ endpoint_type: internalURL
+ network:
+ baremetal-flat-network:
+ tenant: admin
+ shared: True
+ admin_state_up: True
+ provider_network_type: flat
+ provider_physical_network: physnet1
+ port_security_enabled: false
+ subnet:
+ baremetal-subnet:
+ cidr: 192.168.90.0/24
+ enable_dhcp: true
diff --git a/nginx/server/site/ironic.yml b/nginx/server/site/ironic.yml
new file mode 100644
index 0000000..d03311c
--- /dev/null
+++ b/nginx/server/site/ironic.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_ironic:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_ironic
+ check: false
+ proxy:
+ host: ${_param:ironic_service_host}
+ port: 6385
+ protocol: http
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 6385
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nova/compute_ironic/cluster.yml b/nova/compute_ironic/cluster.yml
new file mode 100644
index 0000000..2526373
--- /dev/null
+++ b/nova/compute_ironic/cluster.yml
@@ -0,0 +1,53 @@
+classes:
+- service.nova.compute.ironic
+parameters:
+ nova:
+ compute:
+ version: ${_param:nova_version}
+ enabled: true
+ virtualization: 'baremetal'
+ pkgs:
+ - nova-compute-ironic
+ database:
+ engine: mysql
+ host: ${_param:openstack_database_address}
+ port: 3306
+ name: nova
+ user: nova
+ password: ${_param:mysql_nova_password}
+ identity:
+ engine: keystone
+ region: ${_param:openstack_region}
+ host: ${_param:cluster_vip_address}
+ port: 35357
+ user: nova
+ password: ${_param:keystone_nova_password}
+ tenant: service
+ message_queue:
+ engine: rabbitmq
+ port: 5672
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ network:
+ engine: neutron
+ region: ${_param:openstack_region}
+ host: ${_param:neutron_service_host}
+ port: 9696
+ user: neutron
+ tenant: service
+ password: ${_param:keystone_neutron_password}
+ ironic:
+ region: ${_param:openstack_region}
+ host: ${_param:ironic_service_host}
+ port: 6385
+ user: ironic
+ tenant: service
+ password: ${_param:keystone_ironic_password}
+ auth_type: password
+ project_domain_name: Default
+ user_domain_name: Default
diff --git a/nova/compute_ironic/single.yml b/nova/compute_ironic/single.yml
new file mode 100644
index 0000000..5c19023
--- /dev/null
+++ b/nova/compute_ironic/single.yml
@@ -0,0 +1,47 @@
+classes:
+- service.nova.compute.ironic
+parameters:
+ nova:
+ compute:
+ version: ${_param:nova_version}
+ enabled: true
+ virtualization: 'baremetal'
+ pkgs:
+ - nova-compute-ironic
+ database:
+ engine: mysql
+ host: ${_param:control_address}
+ port: 3306
+ name: nova
+ user: nova
+ password: ${_param:mysql_nova_password}
+ identity:
+ engine: keystone
+ region: ${_param:openstack_region}
+ host: ${_param:control_address}
+ port: 35357
+ user: nova
+ password: ${_param:keystone_nova_password}
+ tenant: service
+ message_queue:
+ engine: rabbitmq
+ port: 5672
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ host: ${_param:control_address}
+ network:
+ engine: neutron
+ region: ${_param:openstack_region}
+ host: ${_param:control_address}
+ port: 9696
+ user: neutron
+ tenant: service
+ password: ${_param:keystone_neutron_password}
+ ironic:
+ region: ${_param:openstack_region}
+ host: ${_param:control_address}
+ port: 6385
+ user: ironic
+ tenant: service
+ password: ${_param:keystone_ironic_password}
diff --git a/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
index 375e600..d10b361 100644
--- a/opencontrail/compute/cluster.yml
+++ b/opencontrail/compute/cluster.yml
@@ -20,6 +20,8 @@
version: ${_param:opencontrail_version}
disable_flow_collection: true
enabled: True
+ bind:
+ address: ${_param:single_address}
discovery:
host: ${_param:opencontrail_control_address}
interface:
diff --git a/openldap/client/groups/mirantis.yml b/openldap/client/groups/mirantis.yml
new file mode 100644
index 0000000..003eba0
--- /dev/null
+++ b/openldap/client/groups/mirantis.yml
@@ -0,0 +1,19 @@
+classes:
+ - system.openldap.client.groups
+parameters:
+ openldap:
+ client:
+ entry:
+ groups:
+ entry:
+ mirantis:
+ attr:
+ description: Mirantis Administrators
+ gidNumber: 20002
+ memberUid:
+ - akomarek
+ - fpytloun
+ - jpavlik
+ classes:
+ - posixGroup
+ - top
diff --git a/openldap/client/people/mirantis.yml b/openldap/client/people/mirantis.yml
new file mode 100644
index 0000000..3673783
--- /dev/null
+++ b/openldap/client/people/mirantis.yml
@@ -0,0 +1,64 @@
+#
+# This class defines Mirantis users. To crypt user password, use this command:
+# echo "{CRYPT}$(mkpasswd --rounds 500000 -m sha-512 --salt `head -c 40 /dev/random | base64 | sed -e 's/+/./g' | cut -b 10-25` 'password')"
+#
+classes:
+ - system.openldap.client.people
+ - system.openldap.client.groups.mirantis
+parameters:
+ openldap:
+ client:
+ entry:
+ people:
+ entry:
+ jpavlik:
+ attr:
+ uid: jpavlik
+ userPassword: '{CRYPT}$6$rounds=500000$sSdm1peCUw78UsaP$l55AuiLv3j.0avLg.k8B2jM.xBczuf9CMursuS4QUm0ZEUgIZkmToPU1PiaTJB37zGgv2ubAYbr2oME7.TX8G1'
+ uidNumber: 20051
+ gidNumber: ${openldap:client:entry:groups:entry:mirantis:attr:gidNumber}
+ gecos: "Jakub Pavlik"
+ givenName: Jakub
+ sn: Pavlik
+ homeDirectory: /home/jpavlik
+ loginShell: /bin/bash
+ mail: jpavlik@mirantis.com
+ classes:
+ - posixAccount
+ - inetOrgPerson
+ - top
+ - shadowAccount
+ akomarek:
+ attr:
+ uid: akomarek
+ userPassword: '{CRYPT}$6$rounds=500000$sSdm1peCUw78UsaP$l55AuiLv3j.0avLg.k8B2jM.xBczuf9CMursuS4QUm0ZEUgIZkmToPU1PiaTJB37zGgv2ubAYbr2oME7.TX8G1'
+ uidNumber: 20052
+ gidNumber: ${openldap:client:entry:groups:entry:mirantis:attr:gidNumber}
+ gecos: "Ales Komarek"
+ givenName: Ales
+ sn: Komarek
+ homeDirectory: /home/akomarek
+ loginShell: /bin/bash
+ mail: akomarek@mirantis.com
+ classes:
+ - posixAccount
+ - inetOrgPerson
+ - top
+ - shadowAccount
+ fpytloun:
+ attr:
+ uid: fpytloun
+ userPassword: '{CRYPT}$6$rounds=500000$T84bEG26yetA1384$.Zh2GZu6pjWdS3hA2WVFzMnWe/hD15IeNIiGM.clq4XpKkwzbNeLbIs7F21vMsxzdOs0R8P8fvjepVHyrPrjQ.'
+ uidNumber: 20053
+ gidNumber: ${openldap:client:entry:groups:entry:mirantis:attr:gidNumber}
+ gecos: "Filip Pytloun"
+ givenName: Filip
+ sn: Pytloun
+ homeDirectory: /home/fpytloun
+ loginShell: /bin/bash
+ mail: fpytloun@mirantis.com
+ classes:
+ - posixAccount
+ - inetOrgPerson
+ - top
+ - shadowAccount
diff --git a/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
index 6d55bee..46ba395 100644
--- a/openssh/server/team/stacklight.yml
+++ b/openssh/server/team/stacklight.yml
@@ -93,6 +93,13 @@
full_name: Krzysztof Szukiełojć
home: /home/kszukielojc
email: kszukielojc@mirantis.com
+ isviridov:
+ enabled: true
+ name: isviridov
+ sudo: true
+ full_name: Illia Svyrydov
+ home: /home/isviridov
+ email: isviridov@mirantis.com
openssh:
client:
enabled: true
@@ -164,6 +171,11 @@
public_keys:
- ${public_keys:kszukielojc}
user: ${linux:system:user:kszukielojc}
+ isviridov:
+ enable: true
+ public_keys:
+ - ${public_keys:isviridov}
+ user: ${linux:system:user:isviridov}
public_keys:
newt:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3odU+3V2uDA2ptAFL9hrJRPNEEdAyztWOZFQ5Oyd9oerTGOU3p4xmrgWWjfKFKbYGhiiIUcYAol5PkTfKukGEkkjCHYA1t023soCaaAj85wCZCnw2zQNAziwxTYmAzTqgxiSvtZNMMrtJvFHRIRDzJ3M1lV0prWNWkMM1/3FAd4W49y6VT3fkMCo8uqG7CfGdgR2DgBCxf9KaNPfW5eDEPOgmE5lK8tVSEI6T+Cg7hbcTf4lFYnlFBnlQgp/0JstsM4Vbwb4B34LOpOsf2S8rrWk2xQMjwaMHXkc2s/E8iW3F5nVFuyEXYISFQIiAHw8dzC6CHgLcyHUVWwznKawZ newt@newt-dev1
@@ -186,8 +198,10 @@
ityaptin:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDLTkl8X9HIJxruAHkmGNQTovy7DCr256pH68xh2DHWinPKUW4ccsCBbqJeF56aEA41OKJlEVOYzD3gQJkDAAbDdy9BlI14oEtzmk3yAtgBwwUzUNMq7oCPrbt4xNg5U26JSb26j69r5vQ4vXA2hf0bCQ68vb3VDqMMaMbneI3rP3qSaq7dauR8sEjx1XAtNen5SygLE46k0pCObJmahGkg39HisoJ/gkjoi/xvQn1JzrYSxWObrBfUbtQN3JbCRozSp/0Env0hMbXj7cS3J/uY68zAWc7GAEFKSmPAol4d/93sRknFUSQKqZjsDaLfiGLte/7oFwLquaz6AJw+mwP ityaptin@ityaptin.local
isvetlov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDflz5rJEC6+yKOteNG2uzObQCtV/c/Rnu9Aku1AJWLMMlouID7RaCUrP642xH2z11kZE+sZk/4c3515M5SPQFVKhjGceftbnI9I7DI1KF4OJwMCSfmACDHM3bJcld8eiKTRBxtk32i6YPdNi6m9unHvPultTIBJCxRP/KVyxOOnQparsSSBhBj2t3Kis+3dnDZNBUJJDWyo69FD0RvAOaWZdogwes0nCl+3JJSNWsATqyS+bi4ojqJimHFKiW2sz8qMX3cMzu9uTx1OWvJWJRgOV5/tPsuuNVt75zPAOsfJnIqQJtpkdZAb4SYK+0jLFcLvB6GBgXY3aHk9nHu9MHr isvetlov@ubuntu
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9lvegjKq6OP7cgF9YU9mPOk1/mfJbov3YnYnhiW1Ks0hrWZyAo+0TV3O7LgWZ8jqD9abbYaOiWCt4d9ABkLUJfCLNAqOJRapJ+tybPAxJKx4eV8pptJ7UF0EdItasTdd+gqJJ4Krk869rwmqVQ4hethdykjhKyWu3bG+uVtFUF5xUj9zaT9NThA6/Xhz0idAiTO8ArmLng4W8ne45gANaHIWXpIsklo6GLUSZwl4z6j2z4joxNJsB1hrw0msT56F26ctkDo6thNMAzPMyZsLjYJBJIRYhdC1d4Up9114nVcY4pzYw76+zXU9zED2XNRLdyAaxFlwXvumAs3iMLI8Z isvetlov@isvetlov-mac.local
akholkin:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDjpy9RI6iEDH/04eOOwreDa+R32USZiWxyFiKHa8zoDAlOfwaZVg6mZWepOxzwxCJPYusPGXCwQ6Zw9tHxVWOCgtzzPpsCCfhUU4v+99Wh08//W8d/s/WFka+5vqyskAO5Z8Ekk+kQU+jpUBG8/gMxAPBjj0fFc5BNeqDY9r9nmMNK6N2RVjvA6wZ8G5hLGxL9bn5Prhf/+avui1NAfy6gsT/mRt1W+eHWTvpijyNGm+m83jU34dQO6gE48n6WdSylLh/fY/p31rzAURaq1V/AZhdbSuZ8aJYDnfHevpK5+hMjoOop3v3hb7WHEmybGujQfW5HVaaWmG7SFlHeKGE/gZ2P9T+bQ+SgO+PmEAw4LayiBkzTPAHdZ2UGZe+3BI5gdM/ayovK2WVO1jS5FNlNGIvEQW+ws9V+ph+S1jL4jobDJEjs358iXrAYpf4JL+LvxFHiuj6EL51tbo8EU22z5mmgRQQ5eFrDzBuVLhcim651A3a5iSlmCeAQ5rTmHX/Op/PbK+3vAtI8vnlK4AhycLvWQ3kK2DRx+Uhzrlk5v6E14SopAhvpGOHqrLgmoHwHp1xt/9M1JgxkOUK5gccFKTQduxLHoTNBaNcP60IOG/MjqUPcOXSBcAN4Y1RDBg+pwXe4PFgOzwKdFoYeuhvtm8y185S0IvvfCHLCD8pNfQ== akholkin@mirantis.com
kszukielojc:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCiUm3Z3W3t4v7oe143rCNM/hbg9NU2bYUmQXek8DJPA4c3Xm6u0q+RL9kEXME+3zcj2HKqMxKsCBLXXdFIsgdUbOBV8AYiuySE220FTnEKRmdxsEnfSaBhXxFyIBNoew4gI7URSqAOclt5WuPJTqRM7K4VhbtzwEgeWVd/NUhxMCCtgkdJCYTSmycxmxs7R6V8vMr9Mb8DOqKkSpOu6f3JkR0lwnFN9zGGC4V/60FlJSDzvvI5Tn40ANPHITivs8xME0znsx7t0bF4vQUimvhYn1mumQCY1NwIaxJ/QqasD6Ag9Sn5dxSg9b3SeLn0JM6qKoIqZtfPYVuCp9gmlH0fyzJUdqu4lKKb2wBw/H5lK6icH4+owMawkav55rbvinHQOqmVCr/Bg/rTfc35ycVqjTXH/5J7OhzioKjU0yFkXFS2X/s8gpyxp3beJ+Ea4faoX+kcs0gyhMYzqC7/DOamrau7aVyEAjKYJNy60xRfjCQzjqiurbxVFh+3Fi64UUn7Bl1QV8VEiU3ztJ118psEI7zA+x2VROLZ1jrtaBYZTYB118JZicaFDycEVgg3+BHX3pFH/QSOjLsA4SK+HJjSz8CFKvWwaO6QJv1/3KHpcGEacMvmqKxwpQK0E4WpjWhglZRMPObQ0dBaGClOujgoOIHXtFGILEpWy2SdzDQkHw== kszukielojc@w541
+ isviridov:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGNZxzOm7OsZi/q6Qk71fnvjCfWk4BfxpZ5hDig6N1f9D0iAMaINyNmlF2PxstSLW0Mjdq2tXTUvVWlYpGrw+YLHQmVk8dckmLdUAxe2Z0oEvtWhiQC64927ibBTgQ2Tjfkao+PFYPbdjiO4FgRymS1/FpGKhvpdyPDCcOLrxsMSK9YpPi4kbkd4GmlGMercuaEzP3JOOzJioOOLtEw3LOLWG5mAIzXjGFxuCNdTI4gqxQm/iw/tOpb9PcsY10EapZsS4Pd8j58vuhJlwdoTxI3gzySJcTlWm0tcphex0g8X0tEUI+zVjemJcrYkZgUpb6x5/mUjNxC4nv+4A4yMTP
diff --git a/powerdns/server/single.yml b/powerdns/server/single.yml
new file mode 100644
index 0000000..13077de
--- /dev/null
+++ b/powerdns/server/single.yml
@@ -0,0 +1,6 @@
+classes:
+ - service.powerdns.server.single
+parameters:
+ powerdns:
+ server:
+ enabled: true
diff --git a/prometheus/server/remote_write/docker.yml b/prometheus/server/remote_write/docker.yml
new file mode 100644
index 0000000..356f31f
--- /dev/null
+++ b/prometheus/server/remote_write/docker.yml
@@ -0,0 +1,8 @@
+parameters:
+ prometheus:
+ server:
+ config:
+ remote_write:
+ docker_remote_write:
+ enabled: true
+ url: http://monitoring_remote_storage_adapter:${prometheus:remote_storage_adapter:bind:port}/write
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
index 7bbf92e..ed6602d 100644
--- a/prometheus/server/target/dns.yml
+++ b/prometheus/server/target/dns.yml
@@ -20,3 +20,8 @@
- 'tasks.monitoring_alertmanager'
type: A
port: ${prometheus:alertmanager:bind:port}
+ - name: 'remote_agent'
+ domain:
+ - 'tasks.monitoring_remote_agent'
+ type: A
+ port: ${telegraf:remote_agent:output:prometheus_client:bind:port}
diff --git a/reclass/storage/system/infra_maas_single.yml b/reclass/storage/system/infra_maas_single.yml
new file mode 100644
index 0000000..eb5a96b
--- /dev/null
+++ b/reclass/storage/system/infra_maas_single.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ infra_maas_node01_hostname: mas01
+ reclass:
+ storage:
+ node:
+ infra_maas_node01:
+ name: ${_param:infra_maas_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.infra.maas
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:infra_maas_node01_deploy_address}
+
diff --git a/reclass/storage/system/openstack_baremetal_cluster.yml b/reclass/storage/system/openstack_baremetal_cluster.yml
new file mode 100644
index 0000000..8cab119
--- /dev/null
+++ b/reclass/storage/system/openstack_baremetal_cluster.yml
@@ -0,0 +1,44 @@
+parameters:
+ _param:
+ openstack_baremetal_node01_hostname: bmt01
+ openstack_baremetal_node02_hostname: bmt02
+ openstack_baremetal_node03_hostname: bmt03
+
+ openstack_baremetal_node01_baremetal_address: ${_param:single_address}
+ openstack_baremetal_node02_baremetal_address: ${_param:single_address}
+ openstack_baremetal_node03_baremetal_address: ${_param:single_address}
+ reclass:
+ storage:
+ node:
+ openstack_baremetal_node01:
+ name: ${_param:openstack_baremetal_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.baremetal
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_baremetal_node01_address}
+ baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
+ openstack_baremetal_node02:
+ name: ${_param:openstack_baremetal_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.baremetal
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_baremetal_node02_address}
+ baremetal_address: ${_param:openstack_baremetal_node02_baremetal_address}
+ openstack_baremetal_node03:
+ name: ${_param:openstack_baremetal_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.baremetal
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_baremetal_node03_address}
+ baremetal_address: ${_param:openstack_baremetal_node03_baremetal_address}
+
+
diff --git a/reclass/storage/system/openstack_baremetal_single.yml b/reclass/storage/system/openstack_baremetal_single.yml
new file mode 100644
index 0000000..d823157
--- /dev/null
+++ b/reclass/storage/system/openstack_baremetal_single.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ openstack_baremetal_node01_hostname: bmt01
+ reclass:
+ storage:
+ node:
+ openstack_baremetal_node01:
+ name: ${_param:openstack_baremetal_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.baremetal
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_baremetal_address}
+ baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
diff --git a/rundeck/client/project/cicd.yml b/rundeck/client/project/cicd.yml
index e33fcae..1a4b228 100644
--- a/rundeck/client/project/cicd.yml
+++ b/rundeck/client/project/cicd.yml
@@ -1,4 +1,13 @@
parameters:
+ _param:
+ rundeck_cis_os_auth_url: none
+ rundeck_cis_os_username: admin
+ rundeck_cis_os_password: password
+ rundeck_cis_os_project_name: admin
+ rundeck_cis_os_domain_id: default
+ rundeck_cis_jobs_repository: https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs
+ rundeck_cis_jobs_revision: master
+ rundeck_cis_elasticsearch_url: none
rundeck:
client:
project:
@@ -20,3 +29,26 @@
hostname: ${_param:cluster_node03_address}
username: ${_param:rundeck_runbook_user}
tags: [cicd, docker]
+ plugin:
+ import:
+ address: ${_param:rundeck_cis_jobs_repository}
+ branch: ${_param:rundeck_cis_jobs_revision}
+ secret:
+ cis/elasticsearch/url:
+ type: password
+ content: ${_param:rundeck_cis_elasticsearch_url}
+ cis/openstack/auth_url:
+ type: password
+ content: ${_param:rundeck_cis_os_auth_url}
+ cis/openstack/username:
+ type: password
+ content: ${_param:rundeck_cis_os_username}
+ cis/openstack/password:
+ type: password
+ content: ${_param:rundeck_cis_os_password}
+ cis/openstack/project_name:
+ type: password
+ content: ${_param:rundeck_cis_os_project_name}
+ cis/openstack/domain_id:
+ type: password
+ content: ${_param:rundeck_cis_os_domain_id}
diff --git a/rundeck/client/runbook.yml b/rundeck/client/runbook.yml
index cb94025..a41481a 100644
--- a/rundeck/client/runbook.yml
+++ b/rundeck/client/runbook.yml
@@ -9,6 +9,8 @@
name: ${_param:rundeck_runbook_user}
system: true
sudo: true
+ groups:
+ - docker
full_name: Rundeck Remote
home: /var/lib/runbook
openssh:
@@ -20,3 +22,5 @@
public_keys:
- key: ${_param:rundeck_runbook_public_key}
user: ${linux:system:user:runbook}
+ accept_env:
+ - RD_OPTION_*
diff --git a/salt/control/cluster/infra_maas_single.yml b/salt/control/cluster/infra_maas_single.yml
new file mode 100644
index 0000000..d8675e8
--- /dev/null
+++ b/salt/control/cluster/infra_maas_single.yml
@@ -0,0 +1,20 @@
+parameters:
+ salt:
+ control:
+ size:
+ infra.maas:
+ cpu: 4
+ ram: 8192
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ mas01:
+ name: ${_param:infra_maas_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: infra.maas
+
diff --git a/salt/control/cluster/openstack_baremetal_cluster.yml b/salt/control/cluster/openstack_baremetal_cluster.yml
new file mode 100644
index 0000000..69c3a2b
--- /dev/null
+++ b/salt/control/cluster/openstack_baremetal_cluster.yml
@@ -0,0 +1,26 @@
+parameters:
+ salt:
+ control:
+ size:
+ openstack.baremetal:
+ cpu: 32
+ ram: 65536
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ bmt01:
+ provider: kvm01.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.baremetal
+ bmt02:
+ provider: kvm02.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.baremetal
+ bmt03:
+ provider: kvm03.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.baremetal
diff --git a/salt/control/cluster/openstack_baremetal_single.yml b/salt/control/cluster/openstack_baremetal_single.yml
new file mode 100644
index 0000000..5ff00f5
--- /dev/null
+++ b/salt/control/cluster/openstack_baremetal_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ control:
+ size:
+ openstack.baremetal:
+ cpu: 32
+ ram: 65536
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ bmt01:
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: openstack.baremetal
diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index 36ddfc2..9173a4a 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -92,6 +92,10 @@
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-nova.git'
revision: ${_param:salt_master_environment_revision}
+ octavia:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-octavia.git'
+ revision: ${_param:salt_master_environment_revision}
opencontrail:
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-opencontrail.git'
diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index b1222d1..827f096 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -70,6 +70,9 @@
nova:
source: pkg
name: salt-formula-nova
+ octavia:
+ source: pkg
+ name: salt-formula-octavia
opencontrail:
source: pkg
name: salt-formula-opencontrail
diff --git a/telegraf/agent/remote.yml b/telegraf/agent/remote.yml
new file mode 100644
index 0000000..c634d54
--- /dev/null
+++ b/telegraf/agent/remote.yml
@@ -0,0 +1,17 @@
+classes:
+- service.telegraf.agent.remote
+parameters:
+ telegraf:
+ remote_agent:
+ omit_hostname: true
+ dir:
+ config: /srv/volumes/local/telegraf
+ config_d: /srv/volumes/local/telegraf/telegraf.d
+ input:
+ internal:
+ output:
+ prometheus_client:
+ bind:
+ address: 0.0.0.0
+ port: 9126
+ engine: prometheus