Remove freeipa,postfix from env
* Bump reclass
Change-Id: Id5471aa204f6b1d387fe09b83b48e8c8677c462c
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index 49d4884..b4063ce 100644
--- a/classes/cluster/virtual-mcp11-aio/.env
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns iptables runtest artifactory logrotate)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup prometheus telegraf elasticsearch kibana rundeck devops-portal memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns iptables runtest artifactory logrotate)
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 19d1aae..5dc344d 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -35,6 +35,7 @@
_param:
openstack_version: mitaka
cluster_public_host: ${_param:single_address}
+ openstack_control_address: ${_param:single_address}
cluster_public_protocol: http
openstack_region: RegionOne
admin_email: root@localhost
diff --git a/classes/system b/classes/system
index 377451b..cab1ae0 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 377451b8030d631a2d5cfe3b5eb3e02ee06a2dcf
+Subproject commit cab1ae01c2ab31942148f0754d172c24fb7845b8