openstack
/
openstack-chef
Code Issues Proposed changes

Add heat into single controller roles 

Keep flushing out our stack by adding heat into the default mix.
I look into adding a simple heat stack integration test with
another patch.

Fix length of heat auth_encryption_key to 32 chars

Depends-On: Ie8d62b449ec272f5cb7a06acdd54b3437aa57f98

Change-Id: I683aafcb060cdcb80ff7ccd025a5bd228c9b41c7
This commit is contained in:
Mark Vanderwiel 2015-08-10 14:56:07 -05:00
parent 013925d1ac
commit fb1b9d8a1f
14 changed files with 75 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Rakefile
View File

@ -112,6 +112,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),
@ -148,6 +150,19 @@ def _setup_cinder_volume # rubocop:disable Metrics/MethodLength
)
end
def _dump_logs
paths = []
%w(nova neutron keystone cinder glance heat).each do |project|
paths << "-r \"\" /etc/#{project}/*"
paths << "-r \"\" /var/log/#{project}/*"
end
_run_commands('Dump Logs', {
'sleep' => ['25'],
'grep' => paths }
)
end
desc "Integration test on Infra"
task :integration => [:create_key, :berks_vendor] do
# This is a workaround for allowing chef-client to run in local mode
@ -162,6 +177,7 @@ task :integration => [:create_key, :berks_vendor] do
puts "####### Pass #{i}"
# Kick off chef client in local mode, will converge OpenStack right on the gate job "in place"
sh %(sudo chef-client --force-logger -z -E integration-aio-neutron -r 'role[allinone-compute]','role[os-image-upload]','recipe[openstack-integration-test::setup]')
_dump_logs
_setup_local_network if i == 1
_run_basic_queries
_setup_cinder_volume

4
data_bags/secrets/orchestration_auth_encryption_key.json
View File

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

9
data_bags/user_passwords/heat_stack_admin.json Normal file
View File

@ -0,0 +1,9 @@
{
"id": "heat_stack_admin",
"heat_stack_admin": {
"encrypted_data": "GHmi2aJPWAXp4UyiennthLH/Kn5GLUAWQHsA3n1pLZU=\n",
"iv": "ifhyjNj74PFd1+vkGiMpdA==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}

5
environments/integration-aio-neutron.json
View File

@ -39,6 +39,11 @@
"libvirt": {
"virt_type": "qemu"
}
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

10
environments/vagrant-aio-centos7-neutron.json
View File

@ -14,10 +14,7 @@
},
"endpoints": {
"bind-host": "0.0.0.0",
"host": "0.0.0.0",
"identity-bind": {
"host": "0.0.0.0"
}
"host": "0.0.0.0"
},
"mq": {
"user": "admin"
@ -53,6 +50,11 @@
"libvirt": {
"virt_type": "qemu"
}
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

9
environments/vagrant-aio-centos7-nova.json
View File

@ -43,10 +43,6 @@
"public_interface": "enp0s3",
"service_type": "nova"
},
"enabled_apis": "ec2,osapi_compute",
"config": {
"ram_allocation_ratio": 5.0
},
"libvirt": {
"virt_type": "qemu"
},
@ -62,6 +58,11 @@
"dns2": "8.8.4.4"
}
]
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

5
environments/vagrant-aio-neutron.json
View File

@ -50,6 +50,11 @@
"libvirt": {
"virt_type": "qemu"
}
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

5
environments/vagrant-aio-nova.json
View File

@ -59,6 +59,11 @@
"dns2": "8.8.4.4"
}
]
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

6
environments/vagrant-multi-centos7-neutron.json
View File

@ -49,7 +49,6 @@
}
},
"compute": {
"enabled_apis": "ec2,osapi_compute",
"novnc_proxy": {
"bind_interface": "enp0s8",
"bind_address": "0.0.0.0"
@ -61,6 +60,11 @@
"public_interface": "enp0s8",
"service_type": "neutron"
}
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

9
environments/vagrant-multi-centos7-nova.json
View File

@ -46,10 +46,6 @@
"service_type": "nova",
"multi_host": "true"
},
"enabled_apis": "ec2,osapi_compute",
"config": {
"ram_allocation_ratio": 5.0
},
"libvirt": {
"virt_type": "qemu"
},
@ -66,6 +62,11 @@
"multi_host": "T"
}
]
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

5
environments/vagrant-multi-neutron.json
View File

@ -101,6 +101,11 @@
"config": {
"ram_allocation_ratio": 5.0
}
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

5
environments/vagrant-multi-nova.json
View File

@ -95,6 +95,11 @@
"multi_host": "T"
}
]
},
"orchestration": {
"heat_stack_user_role": "heat_stack_user",
"stack_user_domain_name": "heat",
"stack_domain_admin": "heat_stack_admin"
}
}
}

1
roles/os-compute-single-controller-no-network.json
View File

@ -22,6 +22,7 @@
"role[os-compute-cert]",
"role[os-compute-vncproxy]",
"role[os-bare-metal-api]",
"role[os-orchestration]",
"role[os-dashboard]"
],
"env_run_lists": {

1
roles/os-compute-single-controller.json
View File

@ -23,6 +23,7 @@
"role[os-compute-cert]",
"role[os-compute-vncproxy]",
"role[os-bare-metal-api]",
"role[os-orchestration]",
"role[os-dashboard]"
],
"env_run_lists": {