Switch to Queens OpenStack release
Change-Id: Ieda0b6445480facd98be9851e7559d46849b9ce2
diff --git a/.gitreview b/.gitreview
index 197beb9..79258cb 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
host=gerrit.mcp.mirantis.net
port=29418
project=salt-models/mcp-virtual-aio
-defaultbranch=stable/pike
+defaultbranch=stable/queens
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/.env b/classes/cluster/virtual-mcp11-aio-ironic/.env
new file mode 100644
index 0000000..5875c35
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-ironic/.env
@@ -0,0 +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 bind powerdns designate iptables runtest artifactory tftpd-hpa baremetal-simulator logrotate)
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-aio-ironic/infra/config.yml
new file mode 100644
index 0000000..3044dc2
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-ironic/infra/config.yml
@@ -0,0 +1,3 @@
+classes:
+- cluster.virtual-mcp11-aio-ironic
+- cluster.virtual-mcp11-aio.infra.config
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
new file mode 100644
index 0000000..219ed8d
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
@@ -0,0 +1,2 @@
+classes:
+ - cluster.virtual-mcp11-aio.infra
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
new file mode 100755
index 0000000..448fe80
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
@@ -0,0 +1,5 @@
+classes:
+- cluster.virtual-mcp11-aio
+- cluster.virtual-mcp11-aio-ironic.infra
+- cluster.virtual-mcp11-aio-ironic.openstack
+- cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
new file mode 100755
index 0000000..60611af
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
@@ -0,0 +1,151 @@
+classes:
+- cluster.virtual-mcp11-aio.openstack
+- system.galera.server.database.ironic
+- system.keystone.client.service.ironic
+- system.nova.compute_ironic.single
+- system.neutron.gateway.ironic
+- system.neutron.client.service.ironic
+- system.ironic.api.single
+- system.ironic.tftpd_hpa
+- system.ironic.conductor.single
+- system.apache.server.site.ironic
+- service.ironic.client
+- service.baremetal_simulator.simulator
+- service.baremetal_simulator.nodes_flat
+- service.baremetal_simulator.network.ovs
+- system.salt.master.formula.pkg.baremetal
+- system.neutron.gateway.ironic
+- system.nova.compute_ironic.single
+parameters:
+ _param:
+ interface_mtu: 1450
+ cluster_internal_protocol: http
+ cluster_public_protocol: http
+ baremetal_interface: ens7
+ baremetal_gateway_ip: 192.168.90.1
+ ironic_version: ${_param:openstack_version}
+ ironic_service_protocol: ${_param:cluster_internal_protocol}
+ ironic_api_type: 'public'
+ cluster_baremetal_local_address: ${_param:single_baremetal_address}
+ openstack_baremetal_node01_address: ${_param:single_address}
+ single_baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
+ openstack_baremetal_node01_baremetal_address: 192.168.90.11
+ openstack_baremetal_node01_hostname: cfg01
+ openstack_baremetal_address: 192.168.90.10
+ keystone_ironic_password: workshop
+ ironic_service_host: ${_param:single_address}
+ mysql_ironic_password: workshop
+ openstack_baremeta_neutron_subnet_cidr: 192.168.90.0/24
+ openstack_baremeta_neutron_subnet_allocation_start: 192.168.90.100
+ openstack_baremeta_neutron_subnet_allocation_end: 192.168.90.150
+ ironic:
+ api:
+ bind:
+ address: 0.0.0.0
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ conductor:
+ api_url: http://${_param:single_baremetal_address}:6385
+ http_url: http://${_param:single_baremetal_address}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ enabled_drivers:
+ - pxe_ipmitool
+ identity:
+ engine: keystone
+ region: RegionOne
+ host: ${_param:single_address}
+ port: 35357
+ user: ironic
+ password: ${_param:keystone_ironic_password}
+ tenant: service
+ auth_type: password
+ user_domain_id: default
+ project_domain_id: default
+ protocol: ${_param:cluster_internal_protocol}
+ neutron:
+ auth_strategy: keystone
+ auth_type: password
+ cleaning_network: baremetal-flat-network
+ provisioning_network: baremetal-flat-network
+ project_domain_id: ${ironic:conductor:identity:project_domain_id}
+ user_domain_id: ${ironic:conductor:identity:user_domain_id}
+ project_name: ${ironic:conductor:identity:tenant}
+ password: ${ironic:conductor:identity:password}
+ username: ${ironic:conductor:identity:user}
+ url: http://${_param:neutron_service_host}:9696
+ project_name: service
+ glance:
+ auth_strategy: 'keystone'
+ auth_type: password
+ host: ${_param:cluster_vip_address}
+ port: 9292
+ region: ${_param:openstack_region}
+ username: glance
+ tenant: service
+ project_name: service
+ project_domain_id: ${ironic:conductor:identity:project_domain_id}
+ user_domain_id: ${ironic:conductor:identity:user_domain_id}
+ password: ${_param:keystone_glance_password}
+ nova:
+ controller:
+ compute_driver: ironic.IronicDriver
+ ironic:
+ protocol: ${_param:cluster_internal_protocol}
+ host: ${_param:single_address}
+ port: 6385
+ auth_type: password
+ project_domain_name: default
+ user: ironic
+ user_domain_name: default
+ password: ${_param:keystone_ironic_password}
+ linux:
+ network:
+ interface:
+ baremetal_interface:
+ enabled: true
+ name: ${_param:baremetal_interface}
+ mtu: ${_param:interface_mtu}
+ proto: static
+ address: ${_param:baremetal_gateway_ip}
+ netmask: 255.255.255.0
+ type: eth
+ br-baremetal:
+ enabled: true
+ type: ovs_bridge
+ mtu: ${_param:interface_mtu}
+ phy-baremetal:
+ enabled: true
+ type: ovs_port
+ bridge: br-baremetal
+ proto: static
+ address: ${_param:cluster_baremetal_local_address}
+ netmask: 255.255.255.0
+ system:
+ group:
+ libvirtd:
+ enabled: true
+ name: libvirtd
+ neutron:
+ server:
+ ironic_enabled: true
+ backend:
+ ironic_vlan_range: 100:1000
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ baremetal_simulator:
+ name: salt-formula-baremetal-simulator
+ source: pkg
diff --git a/classes/cluster/virtual-mcp11-aio-manila/.env b/classes/cluster/virtual-mcp11-aio-manila/.env
index 033df11..156a87d 100644
--- a/classes/cluster/virtual-mcp11-aio-manila/.env
+++ b/classes/cluster/virtual-mcp11-aio-manila/.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 designate barbican iptables manila runtest artifactory logrotate)
+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 designate iptables manila runtest artifactory logrotate)
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/.env b/classes/cluster/virtual-mcp11-aio-ssl/.env
index 9f6d12d..c4dd293 100644
--- a/classes/cluster/virtual-mcp11-aio-ssl/.env
+++ b/classes/cluster/virtual-mcp11-aio-ssl/.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 designate barbican iptables runtest artifactory logrotate)
+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 designate iptables runtest artifactory logrotate)
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml
index 78d1d3a..fd7df8d 100755
--- a/classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml
@@ -19,7 +19,6 @@
neutron_service_protocol: ${_param:cluster_internal_protocol}
heat_service_protocol: ${_param:cluster_internal_protocol}
cinder_service_protocol: ${_param:cluster_internal_protocol}
- barbican_service_protocol: ${_param:cluster_internal_protocol}
designate_service_protocol: ${_param:cluster_internal_protocol}
apache_proxy_ssl:
enabled: true
@@ -39,12 +38,6 @@
apache_proxy_openstack_designate_host: 127.0.0.1
apache_proxy_openstack_placement_host: 127.0.0.1
apache_keystone_api_host: ${_param:single_address}
- barbican:
- server:
- bind:
- address: 127.0.0.1
- identity:
- protocol: https
neutron:
server:
bind:
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/.env b/classes/cluster/virtual-mcp11-aio-telemetry/.env
index ecc24fd..f9b0920 100644
--- a/classes/cluster/virtual-mcp11-aio-telemetry/.env
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/.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 redis apache keystone gnocchi glance nova neutron cinder ceilometer aodh panko heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables runtest artifactory logrotate)
+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 redis apache keystone gnocchi glance nova neutron cinder ceilometer aodh panko heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate)
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index 9f6d12d..c4dd293 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 designate barbican iptables runtest artifactory logrotate)
+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 designate iptables runtest artifactory logrotate)
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 80742a3..54be975 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -17,9 +17,7 @@
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
-- system.galera.server.database.barbican
- system.keystone.client.single
-- system.keystone.client.service.barbican
- system.keystone.client.service.cinder3
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
@@ -37,14 +35,12 @@
- system.cinder.volume.backend.lvm
- system.horizon.server.single
- system.bind.server.single
-- system.barbican.server.single
-- service.barbican.server.plugin.simple_crypto
- system.designate.server.single
- system.designate.server.backend.bind
- service.runtest.tempest
parameters:
_param:
- openstack_version: pike
+ openstack_version: queens
cluster_public_host: ${_param:single_address}
cluster_public_protocol: http
openstack_region: RegionOne
@@ -57,7 +53,6 @@
keystone_internal_path: '/'
keystone_admin_path: '/'
keystone_version: ${_param:openstack_version}
- barbican_version: ${_param:openstack_version}
glance_version: ${_param:openstack_version}
nova_version: ${_param:openstack_version}
neutron_version: ${_param:openstack_version}
@@ -67,7 +62,6 @@
designate_version: ${_param:openstack_version}
keystone_service_token: workshop
keystone_admin_password: workshop
- keystone_barbican_password: workshop
keystone_ceilometer_password: workshop
keystone_cinder_password: workshop
keystone_glance_password: workshop
@@ -77,14 +71,12 @@
keystone_designate_password: workshop
keystone_service_host: ${_param:single_address}
mysql_keystone_password: workshop
- mysql_barbican_password: workshop
mysql_glance_password: workshop
mysql_nova_password: workshop
mysql_neutron_password: workshop
mysql_cinder_password: workshop
mysql_heat_password: workshop
mysql_designate_password: workshop
- barbican_service_host: ${_param:single_address}
heat_service_host: ${_param:single_address}
neutron_service_host: ${_param:single_address}
glance_service_host: ${_param:single_address}
@@ -130,13 +122,12 @@
openstack_public_neutron_subnet_cidr: 192.168.130.0/24
openstack_public_neutron_subnet_allocation_start: 192.168.130.10
openstack_public_neutron_subnet_allocation_end: 192.168.130.254
- barbican_simple_crypto_kek: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
- barbican_integration_enabled: False
galera_ssl_enabled: true
rabbitmq_ssl_enabled: false # untill rabbitmq formula with https://gerrit.mcp.mirantis.net/#/c/15198/ promoted to stable
rabbitmq_port: 5672 # for non-ssl use 5672/for ssl 5671
runtest_tempest_cfg_dir: /root/rally_reports/
runtest_tempest_cfg_name: tempest_generated.conf
+ runtest_tempest_log_file: /home/rally/rally_reports/tempest.log
runtest_tempest_public_net: public
artifactory_user: artifactory_user
artifactory_password: artifactory_password
@@ -151,21 +142,6 @@
server:
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
- barbican:
- server:
- ks_notifications_enable: True
- store:
- software:
- crypto_plugin: simple_crypto
- store_plugin: store_crypto
- global_default: True
- database:
- ssl:
- enabled: ${_param:galera_ssl_enabled}
- message_queue:
- port: ${_param:rabbitmq_port}
- ssl:
- enabled: ${_param:rabbitmq_ssl_enabled}
neutron:
server:
# Temporary install neutron-plugin-ml2 untill https://gerrit.mcp.mirantis.net/#/c/16262/ promoted
@@ -198,8 +174,6 @@
enabled: ${_param:rabbitmq_ssl_enabled}
nova:
compute:
- barbican:
- enabled: ${_param:barbican_integration_enabled}
vncproxy_url: http://${_param:single_address}:6080
network:
user: neutron
@@ -212,8 +186,6 @@
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
controller:
- barbican:
- enabled: ${_param:barbican_integration_enabled}
vncproxy_url: http://${_param:single_address}:6080
database:
ssl:
@@ -224,8 +196,6 @@
enabled: ${_param:rabbitmq_ssl_enabled}
cinder:
controller:
- barbican:
- enabled: ${_param:barbican_integration_enabled}
database:
ssl:
enabled: ${_param:galera_ssl_enabled}
@@ -267,8 +237,6 @@
client:
enabled: True
server:
- barbican:
- enabled: ${_param:barbican_integration_enabled}
database:
ssl:
enabled: ${_param:galera_ssl_enabled}
@@ -311,8 +279,6 @@
convert_to_uuid:
network:
public_network_id: ${_param:runtest_tempest_public_net}
- DEFAULT:
- log_file: /home/rally/rally_reports/tempest.log
compute:
build_timeout: 600
min_microversion: 2.1