Bump Ocata
Change-Id: I43951bb72f03f83bdeaf9fd4024aa23928f60016
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
index c59029b..9609005 100644
--- a/classes/cluster/virtual-mcp11-aio/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -3,6 +3,8 @@
parameters:
_param:
linux_system_codename: xenial
+ apt_mk_version: testing
+ linux_system_purge_repos: false
linux:
system:
name: cfg01
diff --git a/classes/cluster/virtual-mcp11-aio/infra/init.yml b/classes/cluster/virtual-mcp11-aio/infra/init.yml
deleted file mode 100644
index 4a9170f..0000000
--- a/classes/cluster/virtual-mcp11-aio/infra/init.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters:
- _param:
- apt_mk_version: testing
- linux_system_purge_repos: false
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index e17fd5c..9e7f637 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -12,7 +12,6 @@
- system.mysql.client
- system.memcached.server.single
- system.rabbitmq.server.single
-- cluster.virtual-mcp11-aio.infra
- cluster.virtual-mcp11-aio.openstack
- cluster.overrides
parameters:
@@ -49,15 +48,6 @@
enabled: true
# r00tme
password: $6$9ojWyyN.$26Vj46JtCUL6C7XBQ8RmQTZLwo8/8SkqTRElXh0X2YBLrt7E/aVe2AYQ5gguYUwUknZNOSn5q7M9M3Jyf2gof/
- repo:
- linux_system_repo:
- source: ${_param:linux_system_repo}
- architectures: amd64
- clean_file: true
- pin:
- - pin: ${_param:linux_system_repo_pin}
- priority: ${_param:linux_system_repo_priority}
- package: '*'
network:
bridge: openvswitch
interface:
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index b963676..880179b 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -1,7 +1,7 @@
classes:
- system.defaults
- system.linux.system.lowmem
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.mirror.v1.openstack
- system.linux.system.repo.mcp.extra
- system.linux.storage.loopback
- system.rabbitmq.server.vhost.openstack
@@ -15,6 +15,7 @@
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.barbican
+- system.galera.server.database.neutron
- system.keystone.client.single
- system.keystone.client.service.barbican
- system.keystone.client.service.nova21
@@ -117,9 +118,6 @@
rndc_key_file: /etc/designate/rndc.key
designate_quota_zones: 40
designate_worker_enabled: true
- linux_system_repo: deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/xenial ${_param:openstack_version} main
- linux_system_repo_pin: release a=${_param:openstack_version}
- linux_system_repo_priority: 1200
openstack_public_neutron_subnet_gateway: 192.168.130.1
openstack_public_neutron_subnet_cidr: 192.168.130.0/24
openstack_public_neutron_subnet_allocation_start: 192.168.130.10
diff --git a/classes/system b/classes/system
index 7af6314..377451b 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 7af6314ad3f5b8880a42d78bfb70b27b98d460e7
+Subproject commit 377451b8030d631a2d5cfe3b5eb3e02ee06a2dcf