Add mitaka models with trusty
Mitaka models with trusty for maintenance team purposes.
Change-Id: I8eac7ac18d7f7632bdfb36c550eb1ee4c1b4cc80
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
index ca39912..37c5594 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
@@ -2,7 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
@@ -32,11 +32,11 @@
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.openstack_proxy_single
- system.reclass.storage.system.openstack_gateway_single
-- cluster.virtual-mcp-mitaka-ovs.openstack.proxy
-- cluster.virtual-mcp-mitaka-ovs.stacklight.proxy
- cluster.virtual-mcp-mitaka-ovs
parameters:
_param:
+ linux_system_codename: xenial
+ openstack_linux_system_codename: xenial
reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
@@ -146,7 +146,6 @@
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.dashboard
- - cluster.<<node_cluster>>.openstack.proxy
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
@@ -156,37 +155,48 @@
- service.galera.master.cluster
params:
mysql_cluster_role: master
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_control_node02:
classes:
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_control_node03:
classes:
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
- linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_compute_node01:
params:
tenant_address: 10.1.0.105
external_address: 10.16.0.105
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_compute_node02:
params:
tenant_address: 10.1.0.106
external_address: 10.16.0.106
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
external_address: 10.16.0.110
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_proxy_node01:
classes:
- cluster.virtual-mcp-mitaka-ovs.openstack.proxy
params:
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node02:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node03:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
index cbe05b2..fa6b011 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.linux.network.hosts
@@ -14,7 +14,6 @@
tenant_interface: ens5
external_interface: ens6
interface_mtu: 1500
- linux_system_codename: xenial
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
index c06ed3d..a734d72 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
@@ -2,7 +2,7 @@
- system.linux.system.lowmem
- system.linux.storage.loopback
- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
index 7e27212..6b484c5 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
@@ -1,10 +1,6 @@
classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
-- cluster.virtual-mcp-mitaka-ovs
+- system.linux.system.repo.saltstack.xenial
parameters:
_param:
horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
index fa035c4..03d6708 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.neutron.gateway.cluster
@@ -10,7 +10,6 @@
tenant_interface: ens5
external_interface: ens6
interface_mtu: 9000
- linux_system_codename: xenial
linux:
network:
bridge: openvswitch