504 Commits

Author SHA1 Message Date
chenlx
c46f2c9c98 Rename deploy jq role name
Change role name from deploy-yq to deploy-jq for better understand

Change-Id: If853bad049f97367b60e2c7c061af558457a88a5
2018-07-02 04:11:14 +00:00
Zuul
3cee5970a0 Merge "Helm-Toolkit: Simplify and refactor endpoint functions" 2018-07-01 19:01:11 +00:00
Pete Birley
9a25d20712 Helm-Toolkit: Simplify and refactor endpoint functions
This PS refactors the endpoint functions to reduce code repetition
and improve readability.

Change-Id: I4a280d0645206ca74794fc4e69ec374bde4c4633
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-30 10:45:17 +01:00
Steve Wilkerson
80c1ff4071 Gate: Fix version of ansible deployed via dev-deploy
This pins the version of ansible deployed via the makefile
dev-deploy directives to the version used in zuul.  This was
causing issues with docker, as make dev-deploy setup-host was
deploying ansible 2.6. Ansible 2.6 introduces a new flag to the
docker_container module (init) that is incompatible with our
current roles, which resulted in observed failures in osh-infra
and osh

Change-Id: Ibc885b53bce77eb36817024b21efb0e99865f690
2018-06-29 15:39:58 +00:00
Zuul
92f024ba56 Merge "Remove dupliate osh-infra-docker.yaml file" 2018-06-29 01:30:38 +00:00
Pete Birley
17cfa8740e (fix) Helm-Toolkit: Public ingress reverse compatibility
This PS updates Helm-Toolkit to accept both a simple string (previous
operation) and a dict containing host and potentially tls params for
public endpoints.

Change-Id: Ia95e9f008098ef3eb110d651fd06141774ceb8b7
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-28 16:02:19 -05:00
Mark Burnett
59d74756ef Fix: rename tls.ca to ca.crt in secret snippet
Change-Id: Ia2029bb1d2aef6f708fe5ff32daf8ccaf18d8e34
2018-06-28 10:48:54 -05:00
chenlx
49da0d0bb3 Remove dupliate osh-infra-docker.yaml file
We only need keep one of osh-infra-deploy-docker.yaml and
osh-infra-docker.yaml, because the content is almost the same.

Change-Id: I27854c0b9492853f7c4edf130b6533c33292dc89
2018-06-28 14:18:07 +08:00
Zuul
9071a03417 Merge "Update TLS secret templates, remove nagios readiness probe" 2018-06-28 02:42:40 +00:00
Steve Wilkerson
c26a1b53f6 Update TLS secret templates, remove nagios readiness probe
This updates the TLS secret templates to include the backend
service in the dict supplied to the manifest template, as it is
required for the TLS secret to render correctly.

This also removes the readiness probe from the nagios container in
the deployment for the nagios chart, as it wasn't functioning as
intended due to the port not being available for the probe

Change-Id: Iabcfd40c74938e0497d08ffeeebc98ab722fa660
2018-06-27 18:56:45 -05:00
Pete Birley
98f5276e16 Helm-Toolkit: update comments for endpoint lookup functions
This PS updates the comments for endpoint lookup functions

Change-Id: Ifdc96acaac6972c10f6a580eaf37629910a955a5
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-27 10:36:25 +00:00
tp6510
50b480935a This PS updates the comments for bootstrap job
Story: 2002690
Task: 22516

Change-Id: I4487636546ae49502cad357f540cec43d834659b
2018-06-27 03:18:51 -05:00
Zuul
0624466a9f Merge "Move k8s keystone webhook check to voting after manifest changes" 2018-06-27 03:47:57 +00:00
Zuul
714bc3e6da Merge "Ingress: Add initial TLS Support for osh-infra public endpoints" 2018-06-26 23:07:28 +00:00
Steve Wilkerson
b823954787 Ingress: Add initial TLS Support for osh-infra public endpoints
Adds support for TLS on overriden fqdns for public endpoints for
the services that have them in openstack-helm-infra. Currently this
implementation is limited, in that it does not provide support for
dynamically loading CAs into the containers, or specifying them manually
via configuration. As a result only well known or CA's added manually
to containers will be recognised.

Change-Id: I4ab4bbe24b6544b64cd365467e8efb2a421ac3f4
2018-06-26 14:47:19 -05:00
Steve Wilkerson
68fa1d6fbe Grafana: Provision data sources via dynamic template in values
This moves to define the datasources provisioned by grafana via
a template defined in the values.yaml. This allows us to define
multiple datasource types that can be mapped directly to the
corresponding entries in endpoints, which enables us to generate
the data source urls via endpoint lookups rather than hardcoding
this. This is the first step to support multiple data sources in
a singular grafana deployment

Change-Id: Iac7f4b1e07aaf83ae4d2a0c923cd06817f0d8c0d
2018-06-26 13:57:46 -05:00
Zuul
82aab87442 Merge "Add missing readiness probes to openstack-helm-infra charts" 2018-06-26 16:52:29 +00:00
Zuul
6adfc932d8 Merge "Grafana: Update LDAP configuration, update volume mounts" 2018-06-26 16:30:01 +00:00
Zuul
8cfe215514 Merge "Helm-toolkit: Updates manifests to support openstack logging.conf" 2018-06-26 14:16:27 +00:00
Steve Wilkerson
497959371d Grafana: Update LDAP configuration, update volume mounts
This updates the LDAP configuration for grafana, using a template
defined in the values.yaml file. Using the template allows us to
dynamically define LDAP configuration values, such as the bind dn,
search base and group search base paths, the password, and the
LDAP fqdn.  This also updates the volume mount for the
provisioning directory to be defined by the configuration value in
the values.yaml file

Change-Id: I1e4866d1189cf40b08b3443dc725646a1b76094c
2018-06-26 07:36:15 -05:00
Steve Wilkerson
cb7bf2c0b3 Add missing readiness probes to openstack-helm-infra charts
This adds missing readiness probes to the following charts in
openstack-helm-infra: elasticsearch, fluent-logging, kibana,
nagios, prometheus-kube-state-metrics, prometheus-node-exporter,
and prometheus-openstack-exporter

Change-Id: I6a2635b08667c31eadb1b05ba848c658935a17e5
2018-06-26 12:25:36 +00:00
Pete Birley
326303702d Ingress: make tls functions gotpl yaml safe
This PS updates the tls functions to be yaml safe for the service
name.

Change-Id: I535f38a8d92c01280d79926a1f0acd06984aabbf
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-26 02:03:19 -05:00
Zuul
469fe37c3e Merge "Update toolkit to support ingress TLS" 2018-06-26 05:58:59 +00:00
Zuul
e46b1b0c2b Merge "Add proxy environment" 2018-06-26 02:40:13 +00:00
Zuul
048f53cf1c Merge "Update ordering of auth providers in apache reverse proxy" 2018-06-25 20:09:49 +00:00
Steve Wilkerson
2dd5bf0594 Update ordering of auth providers in apache reverse proxy
This updates the ordering of the basic auth providers in the
elasticsearch and nagios chart to check the file provider first
before going out to check the configured ldap server.

Change-Id: I47ff8a1c7b2cefa8425914c5d4d7a76aa8d43216
Signed-off-by: Steve Wilkerson <wilkers.steve@gmail.com>
2018-06-25 12:43:06 -05:00
Steve Wilkerson
8fc69dd369 Move k8s keystone webhook check to voting after manifest changes
This changes the keystone webhook check back to voting once the
helm-toolkit manifest changes are merged in, and depends on the
openstack-helm patchset that introduces the changes the manifest
change required for this check to pass

Depends-On: https://review.openstack.org/576001

Change-Id: I337fe6d57a978e5b92d5bb5ae844e16bb8082609
Signed-off-by: Steve Wilkerson <wilkers.steve@gmail.com>
2018-06-25 08:26:19 -05:00
Steve Wilkerson
9f014af170 Helm-toolkit: Updates manifests to support openstack logging.conf
This modifies the manifest files to include volume mounts for
the logging configuration file, which is required for the jobs
in the charts to function

This also makes the keystone-webhook job nonvting, as the htk
changes will break the osh-charts required for the keystone
webhook job.  The change to add the required fixes can be found
here: https://review.openstack.org/#/c/576001/.

Needed-By: https://review.openstack.org/576001

Change-Id: I543c01c5560570fd67c42fe2f9a060e888532935
Signed-off-by: Steve Wilkerson <wilkers.steve@gmail.com>
2018-06-25 08:11:34 -05:00
Tin Lam
1275a4c7e0 Update toolkit to support ingress TLS
This patch set cleans up inflight patch [1] by moving helm-toolkit
changes to OSH-infra per [0].

[0] https://review.openstack.org/#/c/558065/
[1] https://review.openstack.org/#/c/566350/

Change-Id: Ifdf3a1d11f2a7cb424476d57d407a224b1ab80eb
Needed-by: I8f1b699af29cbed2d83ad91bb6840dccce8c5146
Signed-off-by: Tin Lam <tin@irrational.io>
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-25 06:51:05 -05:00
Gage Hugo
35ac52023a Consolidate member role to standard
With the latest change to keystone regarding default roles, this
change moves all instances of the member role to be set as
"member", from any deviations in casing or characters.

Change-Id: I9f49fb562239047763c88fcb09a13d891b80d60a
2018-06-25 07:25:48 +00:00
Pete Birley
ce21f6e96d Gate: Add support for testing fqdn over-rides in zuul
This PS adds support for testing fqdn over-rides in zuul gates.
When enabled it will direct requests to a configurable domain to
the default ip of the primary node.

Change-Id: I3d9a4a0bf06532caf0f544d44027493622f4ae5b
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-25 02:42:09 +00:00
Tin Lam
bb7842f39f Kubernetes: Bump version to 1.10.5
Upgrades the kubernetes version to v1.10.5 from v1.10.4.

Change-Id: Ic2a1f73c935136135e587945180e67ac928f8178
Signed-off-by: Tin Lam <tin@irrational.io>
2018-06-22 17:00:12 +00:00
Tin Lam
cef6dd5a19 Add proxy environment
This patch set loads the proxy environment variable when executing helm
init as it attempts to reach out to an external address to load the
stable repo. If this is executed with in a corporate environment that
requires a proxy, this would fail without the needed envvars.

Change-Id: I8b1b1efb15352934eb8f2a0b0214e486eea80d46
Signed-off-by: Tin Lam <tin@irrational.io>
2018-06-22 13:12:17 +00:00
Sangeet Gupta
42f475133d kubernetes-keystone-webook: add missing annotation
Fixes issue of not being able to upgrade webhook

Change-Id: Ic258e3d2fc30df2be5119e3f8ec3e650086c7216
2018-06-21 07:38:31 +00:00
Pete Birley
04f648a3a3 Revert "Helm-toolkit: Updates manifests to support openstack logging.conf"
This reverts commit ad5d4259c45940bf4ddd150aad37c5b8d1aabba6.

We need to revert this - as until the charts are updated OSH is broken.

Change-Id: I58db4c0bf7bdccd8ba7cd1e63af00ff1f01c343a
2018-06-21 04:08:28 +00:00
Steve Wilkerson
ad5d4259c4 Helm-toolkit: Updates manifests to support openstack logging.conf
This modifies the manifest files to include volume mounts for
the logging configuration file, which is required for the jobs
in the charts to function

This also makes the keystone-webhook job nonvting, as the htk
changes will break the osh-charts required for the keystone
webhook job.  The change to add the required fixes can be found
here: https://review.openstack.org/#/c/576001/.

Once that change is merged, we can move the keystone-webhook job
back to a voting job

Change-Id: I6ae59e2736624fff5b072e89b6043b23bc8b7f5d
2018-06-20 19:10:30 +00:00
Zuul
71edb4acb3 Merge "Remove the duplicated word" 2018-06-20 05:17:25 +00:00
Zuul
ccc0da5509 Merge "Kube-State-Metrics: Change default image used" 2018-06-19 17:07:43 +00:00
Zuul
b203933351 Merge "Keystone: use internal interface by default" 2018-06-19 16:00:07 +00:00
Pete Birley
654e78733d Keystone: use internal interface by default
This PS updates the openrc functions to use the internal interface by
default for keystone actions performed within the cluster.

Change-Id: I491618d9fd473917e2034a315f292db746f0d7cc
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-19 08:34:34 -05:00
Pete Birley
6bf37d7f84 Rally-Tests: allow os-interface to be defined
This PS updates the rally test runner script to allow the keystone
endpoint interface to be defined.

Change-Id: I88d7446c6bbb85090929be1728a308886cb41a74
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-19 08:08:09 -05:00
Pete Birley
abb00e97fd Gotpl: remove quote and trunc to suppress output
This PS removes the use of the `quote and truncate` approach to
suppress output from gotpl actions in templates and replaces it
with the recommended practice of defining `$_` instead.

Change-Id: I5fedc3471dcbecef37d2fe1302bf9760b3163467
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-16 16:37:08 -05:00
Pete Birley
655f171a7a Dependency Mixin: permit null value to be resolved
This PS udpate the dependency mixin function to permit cases where
the mixin is disabled by passing a null value as the key to use
for resolution.

Change-Id: Idcade7eebed317852b70392431ed02a352241c9b
Signed-off-by: Pete Birley <pete@port.direct>
2018-06-16 12:53:34 -05:00
Zuul
b0c34c4468 Merge "Node-Exporter: Override default image entrypoint" 2018-06-15 14:16:13 +00:00
Zuul
bae870c4e0 Merge "Fix the task name when remove helm stable repo" 2018-06-14 22:19:59 +00:00
Zuul
59cf366ad4 Merge "Kube-state-metrics: Update resources in clusterrole" 2018-06-14 16:24:35 +00:00
Zuul
1051065c2c Merge "Daemonsets: Use current kubernetes daemonset api version" 2018-06-14 16:24:33 +00:00
Steve Wilkerson
5fe73e6e58 Kube-State-Metrics: Change default image used
This changes the default image for kube-state-metrics to use the
bitnami image instead of the coreos image. This allows us to
override the image entrypoint, as the Alpine based image used
previously did not easily allow us to do so. Adding this also
makes creating a common prometheus exporter deployment template
easier, as it reduces the functional differences between exporter
charts and templates

Change-Id: I6c4aac36f563fcb15f52640bc6f9913b45b4358a
2018-06-14 10:04:03 -05:00
Zuul
175b29f8d6 Merge "Gate: Move Fedora job to experimental" 2018-06-14 00:55:49 +00:00
Zuul
0c9eae2d84 Merge "Nagios: update functions to live in correct locations" 2018-06-14 00:55:48 +00:00