122 Commits

Author SHA1 Message Date
Dougal Matthews
cff7ee3359 Fix the deploy tests
The ManillaPassword parameter was added without the tests being updated.
This caused a number of failures. This change also sorts the parameters
to make them easier to visiaully inspect and adds an assert to check the
symetric difference between the parmater keys - making it easier to see
what the extra parameter is when there is one.

Change-Id: I75542ca1bb457ef55405235cbc481b6811a112a8
2015-08-07 08:40:26 +01:00
Dougal Matthews
74bd8fa9b2 Merge "Fix tempest tenant_network_cidr and stack_owner_role" 2015-08-07 08:43:19 +02:00
Dougal Matthews
b76bf2ae69 Merge "Enable Manila Service" 2015-08-05 15:49:01 +02:00
Brad P. Crochet
37d53a1281 Merge changes from topic 'hardwired-params'
* changes:
  Don't assume storage backend choices even when using Ceph
  Don't set storage params when not deploying Ceph
2015-08-04 17:08:48 +02:00
Dougal Matthews
82ff587da2 Merge "Adding some tests for the parameter saving" 2015-07-30 17:07:33 +02:00
Dougal Matthews
517b1c56e8 Merge "Add network-id option to overcloud validate" 2015-07-30 17:06:53 +02:00
Dougal Matthews
fc46c912d6 Merge "Fix swift operator value name" 2015-07-30 17:06:27 +02:00
Jiri Stransky
821d36a75b Don't assume storage backend choices even when using Ceph
This prevents the CLI from hard-wiring storage backend choices for
Cinder and Glance even when OSP-d is deploying Ceph.

This means we now allow user to select combinations like "Glance on
Swift, Cinder on Ceph" but it also means that user has to pass an
environment file with these settings *always*, even for the typical
"Ceph for everything" scenario. So we gain flexibility but lose "smart
behavior".

Change-Id: Ie0f6c763ea9cdeff60b6464935bd387daa285992
2015-07-30 14:52:03 +02:00
Jiri Stransky
c33bc5d8b7 Don't set storage params when not deploying Ceph
This is an attempt to partially fix a situation where oscplugin always
sets some stack parameters and they cannot be overriden [1].

This fix only affects the situation when Ceph is not being deployed (or
at least when Ceph is not managed by RDO Manager).

When Ceph *is* being deployed by RDO Manager, it's still assumed that it
will be the backend for both Cinder and Glance.

A proper fix needs to be implemented later (e.g. using an environment
file instead of direct parameters to pass parameters from oscplugin to
heat).

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1247585

Change-Id: I1479f1b74785adba03cf0b982c46e6763f2bc4d2
2015-07-29 16:13:29 +02:00
Brad P. Crochet
f316f725e9 rhbz#1241199 - Make configure boot safe to run multiple times
https://bugzilla.redhat.com/show_bug.cgi?id=1241199

If properties/capabilities was already set on a node, baremetal configure
boot would overwrite them. This will only add boot_option:local if it
does not exist, and appends if capabilities are already present.

Change-Id: I72252dccf54daf7a95aecb5fe515066976070e6d
2015-07-23 12:16:43 -04:00
Lennart Regebro
04387f8d74 Adding some tests for the parameter saving
Change-Id: Ia3e6c0664435af5b7dbeefcdf717f6c153c60413
2015-07-23 12:05:34 +02:00
Imre Farkas
0dd0af0773 Fix tempest tenant_network_cidr and stack_owner_role
Change-Id: I5923d000829b4a8874fab01c74a42c0357ec5658
2015-07-22 12:46:17 +02:00
Imre Farkas
6d57df10c3 Add network-id option to overcloud validate
Closes-Bug: BZ #1243828
Change-Id: I2bfcbb958a4586d92c3424a90600c960ff526295
2015-07-22 12:20:54 +02:00
Giulio Fidente
7c518a7c0d rhbz#1244913 - Ensure scaling params are reset
https://bugzilla.redhat.com/show_bug.cgi?id=1244913

The params updated when scaling controllers or cephstorage nodes
are saved by Tuskar and not reset in further attempts so we need
to reset them from CLI.

Change-Id: I548867ca1fbb3ddab3e50e9f107b2c05f3fcdd56
2015-07-22 00:57:58 +02:00
Brad P. Crochet
524a1586ce rhbz#1244810 - Skip parameters that do not make sense for scaling
https://bugzilla.redhat.com/show_bug.cgi?id=1244810

Some parameters were incorrectly being set on a scaling operation. This
patch will keep those parameters from being updated on scale.

Change-Id: Ie80cfc086f54d8f60b0edae1ba29f3351e810f67
2015-07-20 13:51:09 -04:00
Brad P. Crochet
ae39af3320 Merge "rhbz#1243274 - Enable Ceph as a Glance Backend when using THT" 2015-07-20 16:23:28 +02:00
Ryan Hefner
ee2c07560d Enable Manila Service
During an overcloud deploy, a Manila password and service endpoint
should be created. Without these, the service isn't acessible for
end-user use.

Change-Id: Id49d4ba0cb63c5730573c52b4b952d37ebf6fe9e
2015-07-17 16:04:47 -04:00
Brad P. Crochet
4b205bd6be Merge "Add ntp element to overcloud-full images" 2015-07-17 16:17:29 +02:00
John Trowbridge
6562c04ffd Add ntp element to overcloud-full images
The RDO promote job is failing to deploy because at some
point we started expecting for ntpd to be installed in
the overcloud images.

Error: Could not start Service[ntp]: Execution of
'/usr/bin/systemctl start ntpd' returned 6: Failed to issue
method call: Unit ntpd.service failed to load: No such file
or directory.
Wrapped exception:
Execution of '/usr/bin/systemctl start ntpd' returned 6:
Failed to issue method call: Unit ntpd.service failed to
load: No such file or directory.

Change-Id: If5020f20bfb2f2750837e831d7f22843f2501736
2015-07-17 09:43:38 -04:00
Dougal Matthews
0b050caabf Add --timeout to provide an optional timeout to Heat
This change also removes the timeout in the CLI as it waits for Heat.
Operators can use ctrl+c if they want to exit early for some reason.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1243365
Change-Id: I6bbaaf6f39f98dc11ccdd1897cd4b7188cd6a2a9
2015-07-17 14:37:40 +01:00
Mathieu Bultel
c9b72d745d Fix swift operator value name
Change-Id: I09cbac4c47909cda088fbbc4eb68fd5f4e4f3c55
2015-07-16 14:34:14 +02:00
Brad P. Crochet
922edf4bb0 rhbz#1243274 - Enable Ceph as a Glance Backend when using THT
https://bugzilla.redhat.com/show_bug.cgi?id=1243274

When using Heat templates directly, the code was missing the enabling of RBD
as the Glance backend when Ceph Storage count > 0.

Change-Id: I8d29b8977bc293e3d254face8b58f7a14307caf8
2015-07-16 12:07:43 +01:00
Dougal Matthews
99f41a684b Merge "Align -e option with heatclient" 2015-07-15 13:55:55 +02:00
Dougal Matthews
ef3ffdf596 Merge "Wires up NeutronDhcpAgentsPerNetwork parameter to deploy" 2015-07-15 10:58:28 +02:00
marios
863493f863 Wires up NeutronDhcpAgentsPerNetwork parameter to deploy
The NeutronDhcpAgentsPerNetwork is a parameter in the tripleo
heat templates and defaults to 2. This does not expose the
parameter to the CLI but rather sets it to the number of
controllers with a minimum of 3, as per
https://github.com/beekhof/osp-ha-deploy/blob/master/pcmk/neutron-server.scenario#L133

Depends-On: https://review.openstack.org/#/c/199102/
Change-Id: Idc56324b187b191be6d900426225c8cbdc0eafd4
2015-07-15 09:25:59 +03:00
Dougal Matthews
bc9db35303 Remove the redundant --use-tripleo-heat-templates
Use --templates instead

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1243016
Change-Id: I5084213562ab6de5985f1c837005f6327c7a0cf1
2015-07-14 17:12:48 +02:00
Steven Hardy
11bd32adf8 Align -e option with heatclient
Currently the long option and help text for the -e option is inconsistent
wrt heatclient - this option allows passing additional heat environment
files, but the current long option and help use the ambiguous term
extra templates, which could be confused for HOT templates.

The new long form is --environment-file, the -e short option is unchanged.

Change-Id: I7eff8965289076f93239c598fd21b537818bfe6e
2015-07-14 15:18:08 +01:00
Dougal Matthews
5056241037 Consolodate --use-t-h-t and --template-root into --templates
Change-Id: I0707283a39b4585f4f9dd41d3cb2b771e796ca4f
2015-07-13 17:34:28 +01:00
Dougal Matthews
4ad081b354 Add --template-root option to allow loading t-h-t from custom locations
The template root for tripleo-heat-templates was previously hardcoded
to the path:

    /usr/share/openstack-tripleo-heat-templates/

This change allows users to specify a new root which is then used by the
hardcoded filenames.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1240101
Change-Id: Ia75741f77a530f443b1c78ba71f9469c5fb12307
2015-07-10 15:11:33 +02:00
Imre Farkas
b728836ae7 Add deployer-input option to overcloud validate
...to pass partial tempest configuration

Partial-Bug: BZ #1230840
Change-Id: I7154f32c70edd8551ae1c0500aeb399f1f0c8a5b
2015-07-09 20:18:58 +02:00
Dougal Matthews
a82de65eeb Set nodes to AVAILABLE after discovery finishes
This originally happened during the deploy, but due to to a bug in
Ironic/Nova [1] there is sometimes a significant delay before the Nova
scheduler is updates.

[1]: https://bugs.launchpad.net/ironic/+bug/1248022

Change-Id: I58eaf373db8335d024899dd6a231f3eb5f51ff9a
2015-07-08 18:33:12 +02:00
Dougal Matthews
bf36eba25a Merge "Add a CLI arg to expose NeutronMechanismDrivers in the deploy command" 2015-07-07 16:44:18 +02:00
James Slagle
7f54916ffe Add sos to overcloud-full image
Include the sos package on the overcloud-full image build.

Change-Id: Ifc5e815716690854e53d7668606658810ad37353
Resolves: rhbz#1238821
2015-07-06 14:23:24 -04:00
Dougal Matthews
d1b923c93c Add a CLI arg to expose NeutronMechanismDrivers in the deploy command
Change-Id: Icb768d47cdc563be94b26fe06a33047176dcddbd
Partially-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1236399
2015-07-06 15:37:47 +01:00
Dougal Matthews
545147967a Merge "Add RHEL registration to the CLI" 2015-07-06 16:13:01 +02:00
Mathieu Bultel
8afe0fd4fe Add skipfile options to openstack validate cli
refacto format string

Change-Id: Iaf7b5ae8cf4450afea52b10e69f4ec95721b6ef5
2015-07-06 11:10:00 +02:00
Marek Aufart
bdd22888b1 Merge "Pass HeatStackDomainAdminPassword through to heat" 2015-07-02 10:20:46 +02:00
Derek Higgins
99a8c6c6d5 Pass HeatStackDomainAdminPassword through to heat
This needs to be passed to avoid setting this password to "unset"

Change-Id: I06202d18e61e570ad3b8066f4c9c11d8fc7d94a4
2015-07-01 16:47:40 +01:00
James Slagle
5a65be1895 Add plotnetcfg to Overcloud image builds
plotnetcfg is useful for collecting additional data about Neutron
configurations via sos-report.

Resolves: rbhz#1227450
https://bugzilla.redhat.com/show_bug.cgi?id=1227450

Change-Id: I31f043501c9f4e96751fae31ca75548927dc90e0
2015-07-01 10:17:09 -04:00
Ben Nemec
44d22fa76e Revert "Add sosreport element to overcloud images."
According to
https://bugzilla.redhat.com/show_bug.cgi?id=1235685
this is breaking the promote job.  Reverting to unblock
while we investigate a proper fix.

This reverts commit 2b5e1c86dedf84e758b8444b7253f1d1310d2a0e.

Change-Id: I694e55b150d1ec060167499dc357faf5809a1939
2015-06-30 13:43:24 -05:00
John Trowbridge
0049685801 Add RHEL registration to the CLI
This patch adds options to configure the overcloud nodes to
register to a satellite or the customer portal. Only
activation-key based registration is supported. For more
advanced uses, the registration templates can be passed
in directly using the '-e' option.

Change-Id: I30fb4520af79c4f1661b618a934fd1848427acfd
2015-06-29 11:09:59 -04:00
Marek Aufart
e426ef07ef Skip nodes under maintenance on baremetal boot config
Cpenstack baremetal configure boot failed on nodes with
maintenance=True. These nodes are skipped now.

Change-Id: I556e8f232b65804a192d1fa5aba2f2e50d8aa57c
Resolves: rhbz#1235325
2015-06-29 14:12:58 +02:00
Dougal Matthews
93cbed813c Merge "Better error message if you forget the plan parameter" 2015-06-26 09:23:29 +02:00
James Slagle
fdc1bd13b9 Use selinux=enforcing for Overlcoud image builds.
Change-Id: I18644eb23b07cf45fdbc1d40a2940db10287111d
Resolves: rhbz#1233062
2015-06-26 08:59:59 +02:00
Lennart Regebro
d47136a3d1 Better error message if you forget the plan parameter
If you forget to specify --plan or --plan-id or
--use-tripleo-heat-templates then you now get an error message
explaining this. I also reorganized the parameter order slightly
for a better help printout.

Change-Id: I5d1eee532b0162f07e2ffd2331a58d50ab8f2a3f
Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1235320
2015-06-25 04:59:33 -04:00
Dmitry Tantsur
90cc7759c7 Introduce sleep between sending nodes to introspection (bz #1234343)
I know it's bad, but we need to work around situations like
https://bugzilla.redhat.com/show_bug.cgi?id=1234343

We had such sleep in our scripts previously:
https://github.com/rdo-management/instack-undercloud/blob/master/scripts/instack-ironic-deployment#L134

Change-Id: Id98cb727c299ff26ab1046005e825a2015aa3c7c
2015-06-25 10:33:54 +02:00
Dougal Matthews
c5e2c71590 Merge "Add tools/run-tests.sh instead of run_tempest.sh" 2015-06-25 09:43:39 +02:00
Brad P. Crochet
77649b3a15 Merge "Pass extra heat templates like heatclient" 2015-06-24 19:47:01 +02:00
Mathieu Bultel
9e10a840ac Add tools/run-tests.sh instead of run_tempest.sh
Change-Id: I78207401e38840a481b473d2a0150cd95e86b8b5
2015-06-24 17:05:53 +02:00
Brad P. Crochet
9b7d9bee19 Merge "Add sosreport element to overcloud images." 2015-06-24 15:54:53 +02:00