summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-08Merge "Enable Cinder as a backend for Glance" into stable/pikeZuul5-6/+20
2017-11-08Merge "Add tags to baremetal cron removal tasks" into stable/pikeZuul4-0/+4
2017-11-07Merge "mysql: Only set certificate specs if TLS everywhere is enabled" into ↵Zuul1-20/+24
stable/pike
2017-11-06Merge "cinder: switch CinderCronDbPurgeUser to 'cinder'" into stable/pikeZuul1-1/+1
2017-11-05Merge "Fix iptables rules override bug in clustercheck docker service" into ↵Zuul1-1/+4
stable/pike
2017-11-05Merge "RHSM: when using proxy, test its connectivity first" into stable/pikeZuul2-6/+37
2017-11-05cinder: switch CinderCronDbPurgeUser to 'cinder'Emilien Macchi1-1/+1
... and not 'keystone' or it fails. Change-Id: Iee4161ec9d8c7a84997ab24ddd234353f3a81dfb Closes-Bug: #1729352 (cherry picked from commit b99a240ccc4f262ee7626518087784eb92b0152f)
2017-11-04Merge "mysql: expose IPv6 configuration to mysql puppet modules" into ↵Zuul2-0/+8
stable/pike
2017-11-04Fix iptables rules override bug in clustercheck docker serviceMichele Baldessari1-1/+4
When deploying a composable HA overcloud with a database role split off to separate nodes we could observe a deployment failure due to galera never starting up properly. The reason for this was that instead of having the firewall rules for the galera bundle applied (i.e. those with the extra control-port for the bundle), we would see the firewall rules for the BM galera service. E.g. we would see the following on the host: tripleo.mysql.firewall_rules: { 104 mysql galera: { dport: [ 873, 3306, 4444, 4567, 4568, 9200 ] Instead of the correct mysq bundle firewall rules: tripleo.mysql.firewall_rules: 104 mysql galera-bundle: dport: [ 873, 3123, 3306, 4444, 4567, 4568, 9200 ] The reason for this is the following piece of code in https://github.com/openstack/tripleo-heat-templates/blob/master/docker/services/pacemaker/clustercheck.yaml#L62: ... MysqlPuppetBase: type: ../../../puppet/services/pacemaker/database/mysql.yaml properties: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} outputs: role_data: description: Containerized service clustercheck using composable services. value: service_name: clustercheck config_settings: {get_attr: [MysqlPuppetBase, role_data, config_settings]} logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]} ... Depending on the ordering of the clustercheck service within the role (before or after the mysql service), the above code will override the tripleo.mysql.firewall_rules with the wrong rules because we derive from puppet/services/... which contain the BM firewall rules. Let's just switch to derive from the docker service so we do not risk getting the wrong firewall rules during the map_merge. Tested this change successfully on a composable HA with split-off DB nodes. Change-Id: Ie87b327fe7981d905f8762d3944a0e950dbd0bfa Closes-Bug: #1728918 (cherry picked from commit 3df6a4204a85b119cd67ccf176d5b72f9e550da6)
2017-11-04mysql: Only set certificate specs if TLS everywhere is enabledJuan Antonio Osorio Robles1-20/+24
The conditional was missing. Change-Id: Ie2617dd9dba1c49f37e82448b6bf229d127ed46a Closes-Bug: #1729384 (cherry picked from commit 410e062aa0d91b99c4493fac6940499cc02e4288)
2017-11-03Merge "Fix nova-cpu/collectd hieradata" into stable/pikeZuul1-1/+1
2017-11-03Merge "Upgrade rhel_reg_sat_repo to 6.2" into stable/pikeZuul2-1/+6
2017-11-03Merge "Run containerized mistral-api eventlet" into stable/pikeZuul1-1/+35
2017-11-03Merge "added level of indirection causes incorrect hiera config" into ↵Zuul2-21/+19
stable/pike
2017-11-03Merge "Add NetIpMap to hieradata for *ExtraConfig overrides" into stable/pikeZuul1-0/+2
2017-11-03Merge "Providing required priviledges to the mounted NFS volume" into ↵Zuul1-0/+23
stable/pike
2017-11-03Merge "Update CephPools format in the docker templates to fit ceph-ansible" ↵Zuul3-17/+25
into stable/pike
2017-11-02RHSM: when using proxy, test its connectivity firstEmilien Macchi2-6/+37
When using RHSM with a proxy, we want to make sure the proxy can be reached. This patch verify that a tcp socket can be open from the client to the proxy. This patch also does a bit of refactoring: - --retry-delay 10 --max-time 30 is now used in a parameter everytime we use curl. - proxy options are now used everytime curl is used, even for detecting which version of Satellite is running, now we use proxy options. Co-Authored-By: Vincent S. Cojot <vincent@cojot.name> Change-Id: I4dcac1528c10f698338383445e27c8a613f9bcd9 Closes-Bug: #1724970 (cherry picked from commit f4e46f4b3ddac3f536a3a1955c91447e8b26ffca)
2017-11-02Merge "RHSM: do not use retry to deploy katello-agent" into stable/pikeZuul1-1/+1
2017-11-02Upgrade rhel_reg_sat_repo to 6.2Emilien Macchi2-1/+6
When deploying with RHSM, sat-tools 6.2 will be installed instead of 6.1. The new version is supported by RHEL 7.4 and provides katello-agent package. Change-Id: I04a9feab02bf606ad6ca923a17947dcca30258da Closes-Bug: #1728638 (cherry picked from commit b248ae1447940f81513be9904a24197bd4af1126)
2017-11-02Fix nova-cpu/collectd hieradataEmilien Macchi1-1/+1
Probably a typo, never caught or even tested. Change-Id: Iaf75edb421a19cb69bf3ead59c83bf812c653f0b Closes-Bug: #1729479 (cherry picked from commit 24f859c01826eb12256cf1a5cd63b8bb1c0e234c)
2017-11-02Merge "Disable MongoDB in scenario002" into stable/pikeZuul2-4/+4
2017-11-02Merge "Fix standalone ControllerOpenstack vars" into stable/pikeZuul2-11/+26
2017-11-02Add NetIpMap to hieradata for *ExtraConfig overridesSteven Hardy1-0/+2
To enable per-node override of bind IPs via the per-role ExtraConfig paramaters, we need to enable hiera interpolation that references the keys defined in NetIpMap, so we add them to the hieradata. To minimise the risk of any conflicts in keynames it's added near the bottom of the hierarchy, but I'm not aware of any conflicting names in our templates/modules. This will allow per-node hieradata override of bind IPs e.g: parameter_defaults: ComputeRack1ExtraConfig: nova::vncproxy::host: "%{hiera('rack1_internal_api')}" ComputeRack2ExtraConfig: nova::vncproxy::host: "%{hiera('rack2_internal_api')}" Closes-Bug: #1726884 Change-Id: Icf7da1d78176c2ee0197ff2459d69d995cbb16ad (cherry picked from commit 65a8b65754d2ea77ec2396658d4e73eb837d34bd)
2017-11-02Merge "Switch RabbitFDLimit to a Puppet integer" into stable/pikeZuul1-1/+1
2017-11-02Merge "Force memcached container log to file" into stable/pikeZuul1-1/+9
2017-11-02Merge "Enable neutron-lbaasv2 UI in Horizon" into stable/pikeZuul1-0/+3
2017-11-02RHSM: do not use retry to deploy katello-agentEmilien Macchi1-1/+1
katello-agent is an optional package, we don't want to use retry. The package is available or not. Fixing a regression from https://review.openstack.org/#/c/386529 Since we use "| true", we can't really use "retry" here. Change-Id: Id8cd9ac54e158ee1743b2f72b169b3a066f69168 Closes-Bug: #1728614 (cherry picked from commit d9f7b01c6c21b306005bad12fcab103b0a9e7591)
2017-11-01added level of indirection causes incorrect hiera configAditya Vaja2-21/+19
- until Newton this worked fine, however starting with Ocata, we do not need the key 'mapped_data' - having it results in extra indirection in the dictionary in neutron_bigswitch_data.json Closes-Bug: #1729453 Change-Id: I3bc9940aeff4e290d83de95a7df294c11f061954 (cherry picked from commit 485339129cee8f5d3223cf47858a5c9f79b0a8de)
2017-11-01Add tags to baremetal cron removal tasksDan Prince4-0/+4
In 59e29b17f4a9f5f65b6f8a7b8e82ef6426d8a51 we forgot to add tags to the Ansible tasks to remove the baremetal cron jobs at step 2. (cherry picked from commit 1128271b460b120a2a59eac3df95082c55e554d0) Change-Id: I23fb134b88336ebc4eb1a97a69a2d73d4ef0edb2 Related-bug: #1708466
2017-11-01Force memcached container log to fileJuan Antonio Osorio Robles1-1/+9
We were relying on the sysconfig options to set the memcached log file, however, this is not happening, as the redirection is being taken as an option and ends up being ignored by the memcached command. So instead, we set the redirection in the container template. Change-Id: Ic94e3fd7884d518eb9558c53acdc6b294823cd0a Closes-Bug: #1720183 (cherry picked from commit ca1fc5848661aacbf14b52e33879190c133c8e48)
2017-11-01Merge "Fix permissions for dockerized horizon" into stable/pikeZuul1-1/+1
2017-10-31Fix standalone ControllerOpenstack varsAlex Schultz2-11/+26
As we've moved to more dynamic generation of variables, the correct variable names are *ControllerOpenstack* not *Controller* for the example standalone environment. Change-Id: Iaa39de9d8794a856e76cc9995d046484632cf604 Closes-Bug: #1721877 (cherry picked from commit 536d1c4af59dc22164666be5cb1826115fdfdeb9)
2017-10-31Merge "Set verbosity by default for memcached" into stable/pikeZuul1-0/+1
2017-10-30persist memcached logs in /var/log/containers/memcached/memcached.logJuan Antonio Osorio Robles1-3/+3
We used to bind-mount /var/log/memcached.log, but this resulted in the file being createdin the memcached container as a directory, since this file didn't exist. This commit takes the approach of other containers and gets the logs to a memcached directory in /var/log/containers. Change-Id: I926b65fa557ad56b4faa2be34452b58f7b01247a Closes-Bug: #1720183 (cherry picked from commit 5020f38301a9a0a70f34878196250e24fc639dec)
2017-10-30Set verbosity by default for memcachedJuan Antonio Osorio Robles1-0/+1
This sets of one level of verbosity for memcached by default. This allows us to see any errors or warnings in the logs. Change-Id: Icc6f56c9e0ee6100286d07c8b6660a08baabb241 Related-Bug: #1720183 (cherry picked from commit 15ad21ba08e92b302318bdc34112601ce666ff35)
2017-10-30Update CephPools format in the docker templates to fit ceph-ansibleGiulio Fidente3-17/+25
The format which ceph-ansible uses to describe the list of pools to be created in the cluster is different from the one which puppet-ceph uses; this commit updates the description and the the docker templates accordingly. Change-Id: I1e5b2c3cbf6ae02c19a2275ca119fed6e173319d Closes-Bug: #1720373 (cherry picked from commit c10aa7a0439fb7d8e8e964e75d73f3cbb54aa9ec)
2017-10-29Enable Cinder as a backend for GlanceAlan Bishop5-6/+20
Enable Cinder as a backend for Glance by adding 'cinder' to the list of allowed choices for the GlanceBackend heat parameter. Update the glance-api docker configuration to allow the feature to work. This is necessary because the feature uses iSCSI, which requires additional privileges. Closes-Bug: #1728409 Depends-On: I850047e32f3608b3ce490e52e2e540695cb1a4ff Change-Id: I42241747de931103a04aa5ee2ed18fd46197d183 (cherry picked from commit e828e8c7bb2e890b243faa767992226dc270bb6f)
2017-10-27Disable MongoDB in scenario002Michele Baldessari2-4/+4
We have disabled mongo by default in containers via: Id2e6550fb7c319fc52469644ea022cf35757e0ce Disable mongodb by default Ie09ce2a52128eef157e4d768c1c4776fc49f2324 Containerized mongodb, disable by default, fix upgrade Let's not use it in scenario002 either. NB: Not entirely clean cherry-pick due to scenario002-multinode-containers.yaml having many more services in master than in pike. Change-Id: I0d2df25ed797ffb8425ba81736526d3688e5de5c Closes-Bug: #1724679 (cherry picked from commit 900416d9809bf4446c0c037128edb033ab9b3bcc)
2017-10-26Enable neutron-lbaasv2 UI in HorizonCédric Jeanneret1-0/+3
Change-Id: I4a09343c59da86daf4e6f00a59f7734c8adb209f Depends-On: I66839e2c42e654a02e5409c6137e479cfb7b385f Partial-Bug: 1724471 (cherry picked from commit 97879c3ce6dcf06908180a06147bd386580ed5ae)
2017-10-26Run containerized mistral-api eventletMartin André1-1/+35
The mistral-api container image we use doesn't have the necessary packages to run via wsgi and this cause puppet to error with: "Notice: /Stage[main]/Mistral::Wsgi::Apache/Openstacklib::Wsgi::Apache[mistral_wsgi]/File[mistral_wsgi]: Dependency File[/var/www/cgi-bin/mistral] has failures: true", Fallback to eventlet mistral-api for the time being until we get a usable mistral-api image. Change-Id: Ic10c579aa3b6d0d6a01f120669be3b5dcc5efcda Depends-On: I54627f1c5a8867738a55bee42075bb6087830c61 Related-Bug: #1724607 (cherry picked from commit e158acb14c4ed92be1a5b961ff1e8ff99b1a5ae3)
2017-10-24Merge "ci-ovn: Disable Swift services in scenario 007 container job" into ↵Zuul1-0/+3
stable/pike
2017-10-24Merge "Create short lived ssh key for enable-ssh-admin.sh" into stable/pikeZuul1-2/+31
2017-10-24Merge "Disable SwiftDispersion when using docker" into stable/pikeZuul1-0/+2
2017-10-24Merge "Support for Satellite Capsule in rhel-registration" into stable/pikeZuul2-9/+15
2017-10-23Disable SwiftDispersion when using dockerMichele Baldessari1-0/+2
We currently have the following in the registry: OS::TripleO::Services::SwiftDispersion: puppet/services/swift-dispersion.yaml Since this service is included by default in the Controller role it will be installed on the host even on a containerized deployment. Let's noop this in docker.yaml until a containerized version of it gets merged. Change-Id: Ic2793d0cfb7b20f4661cb1a45793cae67a4868b4 Closes-Bug: #1723788 (cherry picked from commit 0c8ba9651734a0e6180ca443c87c8c8ca5169d6c)
2017-10-23ci-ovn: Disable Swift services in scenario 007 container jobNuman Siddique1-0/+3
Closes-bug: #1722758 Change-Id: I0161c534807ca45e2d2b6fcace5fc3e26eb450a2 (cherry picked from commit 7e398bf18910e062415ce4e70236ce98577aed13)
2017-10-23Create short lived ssh key for enable-ssh-admin.shJiri Stransky1-2/+31
Instead of using the key provided by user on the command line, create a new short-lived key, give it to Mistral to create a tripleo-admin user with it, and remove the short-lived key. Co-Authored-By: John Fulton <fulton@redhat.com> Change-Id: I6e6ed83fa62319d59d7289b16a1412a340ea6b26 Closes-Bug: #1724578 (cherry picked from commit b0e72c1413c9441aa592b56583e87715e7096152)
2017-10-23Remove deprecation handling from custom rolesJames Slagle1-22/+0
For deployed-server custom roles, the deprecation handlings are removed. As these have always been custom roles with definitions generated from role.role.j2.yaml, these original (now deprecated) param names were never present for anyone using this deployed-server roles data file. Specifically, deprecated_server_resource_name is quite troublesome as it will cause the server resources to get replaced on upgrade as the resource name changes. These were all introduced in If4a8388634fb1dcbb47beeabbd3db005abc80d4e, and this commit removes them. Change-Id: I1c1267f19db972b55466f4649eda62dd7814b94a Closes-Bug: #1723177 (cherry picked from commit 6e7a431df0b7790512eb1920500b8878701c691a)
2017-10-23Merge "Also match config volumes for /var/lib/config-data/puppet-generated/" ↵Zuul1-5/+7
into stable/pike