51 Commits

Author SHA1 Message Date
Matthew Treinish
6b22300c8f Don't remove uwsgi config files on stop
Removing the uwsgi config files on stop breaks upgrades when using
uwsgi, so let's not do that. Keeping the file deletes in cleanup
makes sense and those calls remain.

Change-Id: I603754c3f5ed5d2f143cf789df96018ec99ad692
2017-09-02 19:00:25 -04:00
Jenkins
ba252a958a Merge "Run heat api tests after upgrade" 2017-08-18 04:20:10 +00:00
rabi
5f5a96c669 Run heat api tests after upgrade
Change-Id: I0f5b7204c6dc3cf7bfe50acc5427590ee35d202f
Closes-Bug: #1711282
2017-08-17 09:02:45 +00:00
rabi
48622d46f4 Fix devstack plugin for multinode deployment issues
- Call create_heat_accounts irrespective of whether keystone
is enabled or not.
- Use hardcoded auth_encryption_key

Change-Id: I03fab7f986ec2a9703044f4bff31d477e2e7fe6a
2017-08-04 17:10:03 +05:30
rabi
bcd8c814b7 Add httpd documentation and sample configs
This adds uwsgi sample configs and documentation for
deploying api services with httpd.

This moves the existing mod_wsgi sample configs from devtsack
folder as they are not specific to devstack.

Change-Id: I91fd64d9deba3371b62c00ba8b01a7aca21b2393
2017-07-07 11:00:06 +05:30
rabi
645c58b12f Revert "Revert "Enable heat to use uwsgi with devstack""
This reverts commit 73ff2f16c436fb4cac520fdf6286baaf5d5b011b.

Change-Id: I11200efe50db94d62cef474c248d78e9a3aa1673
2017-07-07 11:00:04 +05:30
rabi
1c8c7a7914 Fix py35 tempest issue
Change-Id: Id89f8d085a81abe4a28affb57994aad29304f23c
2017-06-22 09:11:41 +05:30
Mehdi Abaakouk (sileht)
73ff2f16c4 Revert "Enable heat to use uwsgi with devstack"
It looks like heat is not ready to work inside a prefix.

Telemetry gate is broken since this change. The signal urls generated by heat are wrong and doesn't have the url prefix.

http://logs.openstack.org/44/468844/28/check/gate-telemetry-dsvm-integration-ceilometer-ubuntu-xenial/519194e/logs/screen-aodh-notifier.txt.gz#_Jun_07_08_45_46_995420

This reverts commit c74db669347ce8f498046e124097c3b368d16db2.

Change-Id: I4cbff7c947defbe10777d63a975e0971732a0c6a
2017-06-07 11:36:11 +00:00
rabi
c74db66934 Enable heat to use uwsgi with devstack
This change ensures that api services deployed with apache+uwsgi
by default with devstack. User can still deploy apache+mod_wsgi
by setting WSGI_MODE=mod_wsgi in local.conf.

Using HEAT_USE_APACHE=False or HEAT_USE_MOD_WSGI=False
(for backward compatibility) would deploy the services
without apache.

Change-Id: Ia5e28e2987b4aeab6c049a3bde3a956204ddc5d9
Depends-On: I3b77aafc6104119503363e5db36b0379964daba5
2017-06-05 05:49:22 +00:00
rabi
a5838a8c21 Use common function for logging with devstack
Now that sevices run with systemd at the gate, use the common
function to make it compatible(i.e colorized_logging).

Change-Id: Ieb65618c1bcda3f56201ba3d3c49f6ef1c02c650
2017-05-05 08:51:43 +05:30
Jenkins
954b3bf901 Merge "Tail correct log files with devstack" 2017-03-15 02:28:44 +00:00
Jenkins
5743af8cfa Merge "Fix number of issues with grenade job" 2017-02-09 16:41:23 +00:00
rabi
a47dfea24b Fix number of issues with grenade job
- Use domain ids along with domain names

It's possible that either the domain_id or domain_name
is set in the env.

- Adds an workaround for bug #1662911

- Fix shutdown script for apache

Change-Id: Ib9d3c14327d73d8cb0e0cddcc9d16191797ffffa
Closes-Bug: #1663105
2017-02-09 16:58:26 +05:30
Jenkins
ee366aa79d Merge "Remove leftover install_heat_other" 2017-02-08 14:54:04 +00:00
rabi
320959bbfd Tail correct log files with devstack
We recently changed devstack to use httpd+mod_wsgi as the
default and split the access logs. However, we don't seem
to tail the correct log files.

Change-Id: I3aaefc92e6dbf4721b6a979fc72835abe9b54f14
Closes-Bug: #1661495
2017-02-03 10:49:02 +05:30
rabi
6ef5fa9adc Make API services with apache the default
Run api services with httpd+mod_wsgi in devstack.
This also skips sighup tests conditionally.

Change-Id: I6631f1fecb906ae0c4bb96a2f868117eff045aa0
Closes-Bug: #1656617
2017-01-15 11:53:25 +05:30
rabi
e943d0874c Make number of workers configurable with apache
This also adds the CustomLog directive to separately log
requests.

Change-Id: I7939e1a46f97a00f626cf282c9cba48208d9edea
Closes-Bug: #1656616
2017-01-15 11:53:25 +05:30
rabi
29578fd611 Remove leftover install_heat_other
This was missed when reverting the dummy functions.

Change-Id: If20ae4a1384e3d531889de3558d77cf6c8a0bf90
2017-01-11 11:29:10 +05:30
Jenkins
841492ea32 Merge "Recreate db only if db service is enabled" 2017-01-03 08:03:25 +00:00
Jenkins
89c2cb9255 Merge "Fix typo in plugin.sh" 2016-12-25 18:00:52 +00:00
rabi
3f683abe60 Recreate db only if db service is enabled
When setting up additional devstack instances with heat, don't
recreate the database and do db_sync, as it would point to some
existing database.

Change-Id: I65fb33b0ad69bc4e5ff390e2b110779178b957ce
2016-12-22 10:24:55 +05:30
Nam Nguyen Hoai
14fe913508 Fix typo in plugin.sh
It should be changed from "vitualenv" to "virtualenv".

Change-Id: I36f93d3c6b4f8c809c79856b4bbf2f804cccd95b
2016-12-07 14:23:36 +07:00
rabi
bebe21ae13 Revert "Fix devstack plugin" workaround
This reverts the workaround for the devstack plugin,
as now the gate jobs pass(with the plugin and no devstack
tree heat code) and make it only a devstack plugin.

Change-Id: Ia8d88eca2dec301b692bbef3e1d8988f00e1936a
Depends-On: I5b60422bf1f5fa78aa8f3383f7a222e0356d9e42
2016-12-06 18:17:54 +05:30
Jenkins
cd9990dcda Merge "Cleanup heat apache wsgi configs" 2016-11-25 04:11:55 +00:00
rabi
536eb28ea6 Use apache config templates from local tree
Now that the apache job is fixed, change the plugin to use
apache config templates from local tree. Else, it would
not work when the devstack tree code is removed.

Change-Id: I9a8627ad85821001968948dd7798999c8db14023
2016-11-17 04:04:24 +00:00
lvdongbing
e1d8eb7e81 Cleanup heat apache wsgi configs
Fix the issue that '_cleanup_heat_apache_wsgi' did not be invoked in
'cleanup_heat'.

Change-Id: Ie1960cf78af34f482d6f7c504307b6bcbf3a87b9
2016-11-14 14:00:42 -05:00
rabi
ad4329d008 Remove unnecessary install_heat_other
Remove the redundant code for bulding a pip mirror
for heat agents. At present it's used by
test_server_software_config.py, which is disabled.

We may use RDO packages for the agents in the future,
when we plan to enable these tests.

Change-Id: I94e46927b0d0d7e93d8bf5e58eb27310f443a8bf
Closes-Bug: #1634717
2016-10-19 09:36:56 +05:30
rabi
23f68fa1ab Run integration tests with tempest before upgrade
Now that base and target releases are incremented in grenaderc,
we should run the integration tests using tempest plugin before
upgrade.

Change-Id: I39b7758798ff94401fda042ff6954de75821e8bb
Closes-Bug : #1627297
2016-09-24 18:15:49 +05:30
Jenkins
11d747b4c9 Merge "Don't run neutron tests before upgrade" 2016-09-02 10:16:30 +00:00
rabi
567e93a1ff Use heat functions from plugin for upgrade
Now that we've the devstack plugin in-tree let's use
the functions from the plugin for upgrade, so that
we can remove the devstack tree heat code.

Change-Id: Ic392bcc24bc374ee8511a94f1d8f6ac23131c7e3
2016-09-01 04:25:37 +00:00
rabi
7afb32bdd6 Don't run neutron tests before upgrade
We seem to be running quite a few neutron tests during
upgrade and it seems to result in neutron quotas for
resources being exceeded, when tests run in parallel.

We should avoid running them.

Change-Id: I0a88f509af05a98ddd4811ea920a81cc997a0c6a
Closes-Bug: #1618789
2016-08-31 14:52:12 +05:30
Jenkins
90dcdbaefe Merge "Run heat_integrationtests as a tempest plugin" 2016-08-24 14:12:43 +00:00
Jenkins
805d98e1cf Merge "Fix devstack plugin" 2016-08-24 13:10:56 +00:00
Jenkins
f98b8445bb Merge "Do not use env var conf defaults" 2016-08-24 09:46:35 +00:00
Jenkins
34a5d15ff6 Merge "Deal with cinder-backup service absent" 2016-08-18 17:32:03 +00:00
Steve Baker
fff6518e69 Run heat_integrationtests as a tempest plugin
completes blueprint tempest-plugin-support

Change-Id: I0109e68bb135cd257e2fff74e75575a7e2f91539
2016-08-13 09:53:07 +12:00
Steve Baker
2af6c6ffdc Do not use env var conf defaults
Falling back to environment variable credentials is convenient for
development but could lead to unexpected credentials being used during
tests. Also this is not a known practice for tempest tests.

This change removes the env var defaults and explicitly sets the
credentials to use in prepare_test_env.sh.

Pre and post grenade tests also get their config from the conf file
rather than the environment.

blueprint tempest-plugin-support

Change-Id: Icf9fb4c58ed11483106c2b62d1e1093223f7dc51
2016-08-13 09:52:41 +12:00
Michael Ionkin
3cf288bc8c no need to run integration tests in upgrade
the purpose of upgrade script is to upgrade service,
and heat shouldn't run any jobs inside of that. moreover
there is no benefit in executing these tests after upgrade
because it doesn't test anything related to upgrades:
if heat is correctly configured after upgrade it will be ready
to run tests (but this can be covered by usual integration job).
heat should be testing specific things like
updating stacks after migration to the new openstack code,
deleting stacks and so on.

Co-authored-by: Vitaly Gridnev <vgridnev@mirantis.com>
Change-Id: Ie600dfc09db0ffa91609f92be4b9ef27259b5314
2016-08-11 08:01:41 +00:00
rabi
96e9ff0042 Fix devstack plugin
When heat is enabled, both stack.sh and plugin try to do account
creation (as part of keystone startup which fails as heat is not yet
installed), intialize the db and start the services. In this patch
(which is a workaround), we'll use a set of dummy function calls to
avoid it. We'll remove these functions later(once we clean up devstack
stack.sh) and rename the currently used functions.

Change-Id: I84250d598ba76deae2a5bad6bbf3f0acfe1cfbe6
2016-08-08 14:24:09 +00:00
Jenkins
9befccd0ac Merge "Add devstack plugin" 2016-06-30 16:06:53 +00:00
Pavlo Shchelokovskyy
744527f6ab Deal with cinder-backup service absent
cinder-backup service is optional, and currently not discoverable with
non-admin scoped tokens.

This patch introduces a new config option `volumes.backups_enabled`
(defaults to True for backward compat).
When set to False, it will fail validation of stacks containing volume
resources with deletion_policy set to Snapshot,
as such stacks will be undeletable in the absence of cinder-backup
service.

Change-Id: I10c4787870e7b240d775aa5d66eb1d0a6d837d8d
Partial-Bug: #1595159
2016-06-22 19:02:47 +03:00
ricolin
5676298ada Remove deprecated auth_plugin config
Config auth_plugin in trustee group is deprecated.
Change to use auth_type in trustee group instead.
Closes-Bug: 1592482

Change-Id: I57d2fbbc426b0ce0478f7b8dfac7533c7d513bf0
2016-06-17 06:28:21 +00:00
xiaolihope
c92e5a2b2a Add devstack plugin
This adds the actual devstack plugin, devstack should not run the heat code
in the devstack project.
Note that this is not yet configured to run in the gate.

Change-Id: I8d0918a8f8bb8399793c7164d26739953710b3ec
2016-05-18 00:02:10 +08:00
xiaolihope
14b7600d7e Copy devstack code to heat tree
This begins work toward moving the devstack code to a devstack plugin within
heat tree. This allows us to experiment with the devstack code more easily,
as well as take some load off of the devstack team.
Note that the plugin is not enabled until we enable it in project-config,
so this doesn't actually affect devstack runs yet. The files that exist in
devstack are listed below.

$ find . -name *heat*
./lib/heat
./files/apache-heat-api-cfn.template
./files/debs/heat
./files/apache-heat-pip-repo.template
./files/apache-heat-api-cloudwatch.template
./files/apache-heat-api.template

All of these files are copied to heat tree.

Change-Id: Ie7f16eff554e6cc2c62823cd49b6f726d96f25b4
2016-05-17 23:57:43 +08:00
Rabi Mishra
45a7d1dfb9 Set OS_PROJECT_NAME in grenade script
Change-Id: I1a064648a2bee046e9b5afeafb40ede0ece748eb
Closes-Bug: #1561810
2016-03-25 08:00:11 +05:30
ricolin
bb9d34c33f use stderr for error echo message
Some echo message contain error or warning message which better be contain in
stderr. And futher more some error message already contain in stderr, but for
error message reader, the following information for that echo should be
contained as well.

Change-Id: I2aac631df19829218d446150c91cf6d50aa5e7e7
2016-01-17 05:20:40 +00:00
Thomas Herve
e2b5edef30 Fix grenade upgrade script dependency
This includes lib/apache from devstack as the devstack heat plugin now
requires it.

Change-Id: Ie48e417f2b36ce79c3485e559b6141a1499b6eb1
Closes-Bug: #1511369
2015-10-29 14:24:03 +01:00
Thomas Herve
06f2fd72cd Fix grenade shutdown script
Due to some fix in devstack, using the old lib/heat library doesn't work
anymore, so let's replicate the stop_heat function.

Change-Id: I8e7c62962cef29e35c37ad98a1646630388fb4ab
Closes-Bug: #1506462
2015-10-15 14:38:13 +02:00
Sirushti Murugesan
667fd80d47 Remove ceilometer specific config for grenade plugin
Ceilometer services are now enabled and controlled via a plugin
with this change Ie3219a41a3d371d9ac21552e3d8b15775ea696f6. This
means we can remove all ceilometer specific manual config entries
in the grenade plugin.

Related-Bug: #1489436

Change-Id: I2fbff1fed38ac8acc8a7950024714abea049aeb8
2015-10-14 12:28:35 +05:30
Sirushti Murugesan
ba4a7026c7 Grenade: Run select heat_integrationtests instead of tempest smoke
Only a few tests are run because these tests only verify the
sanity of the build rather than doing the upgrade tests itself. 

Closes-Bug: #1482152
partial blueprint upgrade-tests

Change-Id: I8fed19bd25cc3a62c03c35afafe2b662551dbd4e
2015-10-06 06:58:07 +00:00