5099 Commits

Author SHA1 Message Date
Giulio Fidente
6e352e3911 Fix parsing of DockerCephDaemonImage parameter
Splitting by colon using native str_split function did not work well
because we needed a right split.

This change replaces the str_split calls with yaql rightSplit().

Change-Id: Iab2f69a5fadc6b02e2eacf3c9d1a9024b0212ac6
2017-08-12 11:51:17 +00:00
Jenkins
ac16b57460 Merge "Consolidate puppet/docker deployments with one deploy steps workflow" 2017-08-12 07:18:07 +00:00
Jenkins
19855864b0 Merge "Correct gnocchi-upgrade command quotes" 2017-08-12 04:44:00 +00:00
Jenkins
699ec62274 Merge "Convert compute-role.yaml to role.role.j2.yaml" 2017-08-12 03:19:08 +00:00
Jenkins
0785c93df2 Merge "Convert controller-role.yaml to role.role.j2.yaml" 2017-08-12 03:17:49 +00:00
Jenkins
0406be8328 Merge "TLS everywhere: Configure CA for mongodb" 2017-08-11 21:20:59 +00:00
Jenkins
d7d3c15988 Merge "Add script to create tripleo-admin on deployed servers" 2017-08-11 19:07:26 +00:00
Jose Luis Franco Arza
9b79a9bc74 Correct gnocchi-upgrade command quotes
After merging commit 488796, single quotation marks
were missed. This causes the upgrade to fail as the
flag --sacks-number is considered a su command flag.

Also mounts Ceph config data into the container which
seems needed for the gnocchi-upgrade command when
configured to use Ceph.

Also move the gnocchi db sync to step 4, so ceph is
ready. Add a retry loop to ceilometer-upgrade cmd so
it doesnt fail while apache is restarted.

Closes-Bug: #1709322
Change-Id: I62f3a5fa2d43a2cd579f72286661d503e9f08b90
2017-08-11 15:01:27 -04:00
Jenkins
e4304b0477 Merge "openstack-heat-templates: fix deprecation path" 2017-08-11 17:55:43 +00:00
Steven Hardy
7f6305980d Consolidate puppet/docker deployments with one deploy steps workflow
If we consolidate these we can focus on one implementation (the new ansible
based one used for docker-steps)

Change-Id: Iec0ad2278d62040bf03613fc9556b199c6a80546
Depends-On: Ifa2afa915e0fee368fb2506c02de75bf5efe82d5
2017-08-11 17:25:02 +00:00
Steven Hardy
d8e2531820 Convert compute-role.yaml to role.role.j2.yaml
Add some special-casing for backwards compatibility, such that the
Compute role can be rendered via j2 for support of composable networks.

Change-Id: Ieee446583f77bb9423609d444c576788cf930121
Partially-Implements: blueprint composable-networks
2017-08-11 15:06:34 +01:00
Steven Hardy
1aad286ca3 Convert controller-role.yaml to role.role.j2.yaml
Add deprecated role-specific parameters to role definition, in
order to special-case some parameters for backwards compatibility,
such that the Controller role can be rendered via j2 for support
of composable networks.

Co-Authored By: Dan Sneddon <dsneddon@redhat.com>
Change-Id: I5983f03ae1b7f0b6add793914540b8ca405f9b2b
Partially-Implements: blueprint composable-networks
2017-08-11 15:06:34 +01:00
Juan Antonio Osorio Robles
0d8a3399eb TLS everywhere: Configure CA for mongodb
It wasn't being configured, thus making mongodb fail.

Change-Id: If0d7513aacfa74493a9747440fb97f915a77db84
Closes-Bug: #1710162
2017-08-11 16:07:13 +03:00
Jenkins
4e5ba44218 Merge "Move HAProxy's public TLS logic from controller to service template" 2017-08-11 12:02:30 +00:00
Jenkins
13668d83ba Merge "Set virsh secret with an init step when using Ceph" 2017-08-11 11:28:41 +00:00
Jenkins
ef6b8d44c2 Merge "Keep dynamic network creation backward compatible." 2017-08-11 11:26:41 +00:00
Juan Antonio Osorio Robles
74e7e67459 Move HAProxy's public TLS logic from controller to service template
This de-couples public TLS from controllers to now run wherever HAProxy
is deployed.

Partially-Implements: blueprint composable-networks
Change-Id: I9e84a25a363899acf103015527787bdd8248949f
2017-08-11 04:07:38 +00:00
Jenkins
f3c58d50d3 Merge "Noop controller pre and post config resources." 2017-08-10 21:49:55 +00:00
Jenkins
87ddcb8380 Merge "Fix cidr get_attr in custom networks" 2017-08-10 19:41:17 +00:00
Jenkins
78c191215e Merge "Create parameters for haproxy TLS certs and keys" 2017-08-10 19:37:55 +00:00
Jenkins
a454ff5acb Merge "Docker/TLS everywhere: Add telemetry and neutron services to environment" 2017-08-10 04:32:32 +00:00
Jenkins
7cbc378fe3 Merge "Addition of Nuage as mechanism driver for ML2" 2017-08-09 15:11:25 +00:00
Giulio Fidente
c20033524d Set virsh secret with an init step when using Ceph
Run virsh secret-define and secret-set-value in an init step
instead of relying on the puppet-nova exec.

Co-Authored-By: Jiri Stransky <jistr@redhat.com>
Change-Id: Ic950e290af1c66d34b40791defbdf4f8afaa11da
Closes-Bug: #1709583
2017-08-09 16:19:39 +02:00
Jenkins
aca0c4fc2d Merge "Use number for KeystoneCronTokenFlushMaxDelay instead of string" 2017-08-09 07:42:18 +00:00
Jenkins
ee5a92b953 Merge "Don't curl metadata server in userdata example" 2017-08-09 04:41:12 +00:00
Jenkins
e32150bd45 Merge "MariaDB: create clustercheck user at container bootstrap" 2017-08-08 21:53:34 +00:00
Giulio Fidente
7d332c92a6 Fix cidr get_attr in custom networks
We were missing the square brackets around the list of arguments
for get_attr when building the networks cidr output.

This passed CI because Heat does not fail validation and Ceph (which
is consuming the cidr output) is tested with a single network (ctlplane)
which does not build the output using the same templates.

Change-Id: I40bba0784a30295cb0d4eda1fbff20ebac85db99
Closes-Bug: #1709464
2017-08-08 21:00:30 +02:00
Juan Antonio Osorio Robles
9ed710054c Docker/TLS everywhere: Add telemetry and neutron services to environment
some resources were missing, so this syncs up what's working right now.

bp tls-via-certmonger-containers

Change-Id: Ic8fe20d0240f1ad8f18218d66634029d522d4d5a
2017-08-08 12:35:05 +00:00
Sofer Athlan-Guyot
a8a1d5b30c Keep dynamic network creation backward compatible.
We had an history mapping for InternalApi to InternalNetwork.  If we
remove it then heat will want to destroy InternalNetwork and create
InternalApi which cannot work during upgrade.

This adds compat name parameters to network_data.yaml.

Closes-Bug: #1709105

Change-Id: I8ce6419a5e13a13ee6e991db5ca2196763f52d7a
2017-08-08 14:01:08 +02:00
Jiri Stransky
507bed1da9 Add script to create tripleo-admin on deployed servers
When using deployed servers, we want to create a standard
tripleo-admin user for Mistral's ssh tasks (e.g. running Ansible on
overcloud). This script wraps the respective Mistral workflow.

Change-Id: I2de698b4aae07f74569243a9e7c1c56eb578e700
Related-Bug: #1708180
Depends-On: Ibe8e54f7b38d8c6c8d944d2b13f0eed004c34c4c
2017-08-08 08:07:19 +02:00
Juan Antonio Osorio Robles
65e9ffa15f Create parameters for haproxy TLS certs and keys
this removes the hardcoded paths for the haproxy certs and keys and will
enable re-use. We'll use this in a further commit in the containterized
TLS work.

Change-Id: I602e5a569e2e7e60835deb80532abcedd7a1f63d
2017-08-07 13:03:25 +03:00
Juan Antonio Osorio Robles
79aca264ff Use number for KeystoneCronTokenFlushMaxDelay instead of string
Using a string results in an erroneous check in puppet-keystone, which
sets up a zero where it shouldn't. So we change it to number to avoid
that. Note that there will also be a puppet-keystone fix for this.
Changing the value here assures that deployers only give valid values to
this parameter.

Change-Id: I00823e23358df91ce54f421c12636f05d4196e15
Closes-Bug: #1708584
2017-08-07 08:28:23 +00:00
Jenkins
5bf7d6582b Merge "Add Telemetry services to scenario002" 2017-08-05 16:22:56 +00:00
Jenkins
92535b10ec Merge "Start redis service after upgrade" 2017-08-05 15:22:56 +00:00
Jenkins
b41d110b3a Merge "Stop and disable openstack-nova-compute service on compute nodes" 2017-08-04 20:47:16 +00:00
Jenkins
efad331d0d Merge "Run gnocchi upgrade with sacks in docker template" 2017-08-04 20:47:07 +00:00
Jenkins
3899491b1c Merge "Change the directory for haproxy certs/keys to be service-specific" 2017-08-04 14:04:44 +00:00
Jenkins
fd1b1f8ec6 Merge "Copy scheduler configuration from service/ironic to services-docker/ironic" 2017-08-04 13:20:11 +00:00
Jenkins
bbe2244c69 Merge "Fix up multipath docker indentation" 2017-08-04 12:31:57 +00:00
Juan Antonio Osorio Robles
0414e97f81 Change the directory for haproxy certs/keys to be service-specific
This moves the directories containing the certs/keys for haproxy one step
further inside the hierarchy. This way we will be able to bind-mount
this certificate into the container without bind-mounting any other
certs/keys from other services.

bp tls-via-certmonger-containers

Depends-On: Iba3adb9464a755e67c6f87d1233b3affa8be565a
Change-Id: I73df8d442b361cb5ef4e343b4ea2a198a5b95da9
2017-08-04 10:43:50 +00:00
Jenkins
f96e07c909 Merge "Adds environment file for ODL + SRIOV" 2017-08-04 10:16:42 +00:00
Jenkins
4d2bb6fcec Merge "Changing the default port-binding configuration" 2017-08-04 06:33:48 +00:00
Pradeep Kilambi
0800daaae5 Update EventPipelinePublisher param description to include zaqar
Since we now support zaqar:// publisher, Enhance the description to indicate
how to set the zaqar publisher.

Change-Id: Ib7eba98d199fade2346620672e33b74686d4685b
2017-08-03 22:38:06 +00:00
Jenkins
1ea7c35f4f Merge "Make UpgradeLevelNovaCompute parameters consistent" 2017-08-03 21:53:09 +00:00
Jenkins
45c95100cf Merge "Add environment for setting a custom domain name" 2017-08-03 21:52:28 +00:00
lokesh-jain
0bc2403ecf Addition of Nuage as mechanism driver for ML2
Adding composable services for Nuage mechanism driver for ML2. This
is separate from Nuage as the core plugin and intentional duplication
of Nuage under puppet services. Parameters required for working of
Nuage as mechanism driver are also added.

Change-Id: I2b564610721152c4f4dab9da79442256ba8d0b33
2017-08-03 17:15:18 -04:00
Jenkins
2bc6d68676 Merge "Update capabilities map to match latest environments" 2017-08-03 17:59:45 +00:00
Jenkins
b3b9e953a9 Merge "Make many networking parameters consistent" 2017-08-03 14:19:44 +00:00
Marius Cornea
0be476483b Stop and disable openstack-nova-compute service on compute nodes
This change stops and disables the openstack-nova-compute service
on the compute nodes during the upgrade to the containers architecture.

Closes-bug: 1708371

Change-Id: I9ca909d4e91d0a0e4de15572f727f959d9185c64
2017-08-03 09:06:04 +02:00
Jenkins
2cf0a6843a Merge "Fix CA file bind mounting in containers" 2017-08-03 06:46:16 +00:00