Add heat-cfn-keystone to required_for in keystone-controller

Also fix python-openstackclient package install.

Change-Id: Iad6ff64be7e96214332a3519abcbc40c3fe4f863
Closes-Bug: #1590435
This commit is contained in:
Matthew Mosesohn 2016-06-08 16:30:16 +03:00
parent 6e8977b414
commit fa7d4daf68
2 changed files with 4 additions and 4 deletions

View File

@ -127,6 +127,6 @@ deploy_vrouter: <%= @deploy_vrouter %>
#FIXME(mattymo): https://bugs.launchpad.net/fuel/+bug/1479317
package { 'python-openstackclient':
ensure => latest,
ensure => 'installed',
}
}

View File

@ -174,9 +174,9 @@
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
# TODO(mattymo): Use cross-depended-by when it works
required_for: [ceilometer-keystone, neutron-keystone, nova-keystone,
ironic-keystone, swift-keystone, heat-keystone, aodh-keystone,
glance-keystone, sahara-keystone, murano-keystone, murano-cfapi-keystone,
cinder-keystone, radosgw-keystone]
ironic-keystone, swift-keystone, heat-keystone, heat-cfn-keystone,
aodh-keystone, glance-keystone, sahara-keystone, murano-keystone,
murano-cfapi-keystone, cinder-keystone, radosgw-keystone]
cross-depends:
- name: /(primary-)?keystone/
role: ["/(primary-)?standalone-keystone/"]