[noha] Update OpenStack version to Queens

* make cluster names version-agnostic
* pre-install oslo-templates formula
* salt version update to 2017.7
* system reclass update

Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

1 files changed, 0 insertions, 134 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
deleted file mode 100644
index ff99b9b42..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-parameters:
-  _param:
-    openstack_version: pike
-    apt_mk_version: nightly
-    mcp_repo_version: 1.1
-    openstack_region: RegionOne
-    admin_email: root@localhost
-    cluster_public_protocol: http
-    cluster_public_host: ${_param:opnfv_openstack_control_node01_external_address}
-    neutron_public_protocol: http
-    neutron_control_dvr: 'False'
-    neutron_l3_ha: 'False'
-    neutron_global_physnet_mtu: 1500
-    neutron_external_mtu: 1500
-    neutron_gateway_dvr: 'False'
-    neutron_gateway_agent_mode: legacy
-    neutron_compute_dvr: 'False'
-    neutron_compute_agent_mode: legacy
-    neutron_compute_external_access: 'False'
-    galera_server_cluster_name: openstack_cluster
-    galera_server_maintenance_password: opnfv_secret
-    galera_server_admin_password: opnfv_secret
-    cluster_vip_address: ${_param:cluster_public_host}
-    cluster_local_address: ${_param:openstack_control_address}
-    cluster_node01_hostname: ctl01
-    cluster_node01_address: ${_param:opnfv_openstack_control_node01_address}
-    cluster_node02_hostname: ctl02
-    cluster_node02_address: ${_param:opnfv_openstack_control_node02_address}
-    cluster_node03_hostname: ctl03
-    cluster_node03_address: ${_param:opnfv_openstack_control_node03_address}
-    rabbitmq_secret_key: opnfv_secret
-    rabbitmq_admin_password: opnfv_secret
-    rabbitmq_openstack_password: opnfv_secret
-    rabbitmq_cold_password: opnfv_secret
-    glance_version: ${_param:openstack_version}
-    glance_service_host: ${_param:cluster_local_address}
-    keystone_version: ${_param:openstack_version}
-    keystone_service_host: ${_param:cluster_local_address}
-    heat_version: ${_param:openstack_version}
-    heat_service_host: ${_param:cluster_local_address}
-    heat_domain_admin_password: opnfv_secret
-    ceilometer_version: ${_param:openstack_version}
-    ceilometer_service_host: ${_param:cluster_local_address}
-    ceilometer_database_host: ${_param:cluster_local_address}
-    cinder_version: ${_param:openstack_version}
-    cinder_service_host: ${_param:cluster_local_address}
-    nova_version: ${_param:openstack_version}
-    nova_service_host: ${_param:cluster_local_address}
-    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
-    neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:cluster_local_address}
-    mysql_admin_user: root
-    mysql_admin_password: opnfv_secret
-    mysql_cinder_password: opnfv_secret
-    mysql_ceilometer_password: opnfv_secret
-    mysql_glance_password: opnfv_secret
-    mysql_grafana_password: opnfv_secret
-    mysql_heat_password: opnfv_secret
-    mysql_keystone_password: opnfv_secret
-    mysql_neutron_password: opnfv_secret
-    mysql_nova_password: opnfv_secret
-    mysql_aodh_password: opnfv_secret
-    keystone_service_token: opnfv_secret
-    keystone_admin_password: opnfv_secret
-    keystone_ceilometer_password: opnfv_secret
-    keystone_cinder_password: opnfv_secret
-    keystone_glance_password: opnfv_secret
-    keystone_heat_password: opnfv_secret
-    keystone_keystone_password: opnfv_secret
-    keystone_neutron_password: opnfv_secret
-    keystone_nova_password: opnfv_secret
-    ceilometer_secret_key: opnfv_secret
-    metadata_password: opnfv_secret
-    horizon_version: ${_param:openstack_version}
-    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
-    horizon_identity_host: ${_param:cluster_vip_address}
-    horizon_identity_encryption: none
-    horizon_identity_version: 3
-    aodh_version: ${_param:openstack_version}
-    keystone_aodh_password: opnfv_secret
-    aodh_service_host: ${_param:cluster_local_address}
-    gnocchi_version: 4.0
-    gnocchi_service_host: ${_param:cluster_local_address}
-    mysql_gnocchi_password: opnfv_secret
-    keystone_gnocchi_password: opnfv_secret
-    panko_version: ${_param:openstack_version}
-    panko_service_host: ${_param:cluster_local_address}
-    mysql_panko_password: opnfv_secret
-    keystone_panko_password: opnfv_secret
-    ceilometer_agent_default_polling_interval: 180
-    ceilometer_agent_default_polling_meters:
-      - "*"
-  linux:
-    system:
-      kernel:
-        sysctl:
-          net.ipv4.tcp_congestion_control: yeah
-          net.ipv4.tcp_slow_start_after_idle: 0
-          net.ipv4.tcp_fin_timeout: 30
-    network:
-      host:
-        ctl:
-          address: ${_param:openstack_control_address}
-          names:
-            - ctl
-            - ctl.${_param:cluster_domain}
-        ctl01:
-          address: ${_param:openstack_control_node01_address}
-          names:
-            - ctl01
-            - ctl01.${_param:cluster_domain}
-        gtw01:
-          address: ${_param:openstack_gateway_address}
-          names:
-            - gtw01
-            - gtw01.${_param:cluster_domain}
-        cmp01:
-          address: ${_param:opnfv_openstack_compute_node01_control_address}
-          names:
-            - cmp01
-            - cmp01.${_param:cluster_domain}
-        cmp02:
-          address: ${_param:opnfv_openstack_compute_node02_control_address}
-          names:
-            - cmp02
-            - cmp02.${_param:cluster_domain}