add heat back to allinone role after refactoring

* added orchestration recipes to integration test (allinone role)
* added heat queries back to basic_queries in Rakefile (were removed previously
  until refactore)

Change-Id: Ic1a1863343be0d0d21b66a804af18c67ee625ee0
Implements: blueprint cookbook-refactoring
Depends-On: I16a29e28068d106f0edcbe04cb529aabbbed1ac5
This commit is contained in:
Jan Klare 2016-03-08 10:20:34 +01:00
parent de3c86d681
commit 7fc714104b
5 changed files with 35 additions and 1 deletions

View File

@ -106,6 +106,8 @@ def _run_basic_queries # rubocop:disable Metrics/MethodLength
'keystone' => %w(--version user-list endpoint-list role-list service-list tenant-list),
'cinder-manage' => ['version list', 'db version'],
'cinder' => %w(--version list),
'heat-manage' => ['db_version', 'service list'],
'heat' => %w(--version stack-list),
'rabbitmqctl' => %w(cluster_status),
'ifconfig' => [''],
'neutron' => %w(agent-list ext-list net-list port-list subnet-list quota-list),
@ -150,7 +152,7 @@ end
def _dump_logs
paths = []
%w(nova neutron keystone cinder glance).each do |project|
%w(nova neutron keystone cinder glance heat).each do |project|
paths << "-r \"\" /etc/#{project}/*"
paths << "-r \"\" /var/log/#{project}/*"
end

View File

@ -0,0 +1,9 @@
{
"id": "heat",
"heat": {
"encrypted_data": "zgl0ZuuOiJ0LpzDdKCX4M9n/l9bkcF4Z45gv4abyLng=\n",
"iv": "182xiFiVaERWG53LotL7Gg==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}

View File

@ -0,0 +1,9 @@
{
"id": "orchestration_auth_encryption_key",
"orchestration_auth_encryption_key": {
"encrypted_data": "2zjK5nNVG3ZTXQ6ZbpGBWjK+7X7vhcI8xq8EstBYdSQtrzcPAFToUG0jbb9d\nmJuJ10uXoH+JntEM68pNmCRsrw==\n",
"iv": "XMpkT6S0qeATHewNsnQCrw==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}

View File

@ -0,0 +1,9 @@
{
"id": "openstack-orchestration",
"openstack-orchestration": {
"encrypted_data": "0HpyFflTF4UHGDtq3koSMGkLOZ7XAKrp0fw2D0rKSt0=\n",
"iv": "xRgADbFNtnNdPrRHGdI1vg==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}

View File

@ -51,6 +51,11 @@
"recipe[openstack-block-storage::volume]",
"recipe[openstack-block-storage::backup]",
"recipe[openstack-block-storage::identity_registration]",
"recipe[openstack-orchestration::engine]",
"recipe[openstack-orchestration::api]",
"recipe[openstack-orchestration::api-cfn]",
"recipe[openstack-orchestration::api-cloudwatch]",
"recipe[openstack-orchestration::identity_registration]",
"recipe[openstack-common::client]",
"recipe[openstack-dashboard::server]"
],