diff options
| -rw-r--r-- | environments/major-upgrade-pacemaker-converge.yaml | 4 | ||||
| -rwxr-xr-x | extraconfig/tasks/pacemaker_resource_restart.sh | 6 | ||||
| -rw-r--r-- | overcloud.yaml | 1 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 6 | ||||
| -rw-r--r-- | puppet/controller.yaml | 7 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 18 |
6 files changed, 32 insertions, 10 deletions
diff --git a/environments/major-upgrade-pacemaker-converge.yaml b/environments/major-upgrade-pacemaker-converge.yaml index f023cb32..dfcb9654 100644 --- a/environments/major-upgrade-pacemaker-converge.yaml +++ b/environments/major-upgrade-pacemaker-converge.yaml @@ -1,2 +1,6 @@ parameter_defaults: + UpdateIdentifier: 'true' UpgradeLevelNovaCompute: '' + +resource_registry: + OS::TripleO::Tasks::PackageUpdate: ../extraconfig/tasks/yum_update_noop.yaml diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh index 09a452e6..b2bdc55a 100755 --- a/extraconfig/tasks/pacemaker_resource_restart.sh +++ b/extraconfig/tasks/pacemaker_resource_restart.sh @@ -36,9 +36,3 @@ if [ "$pacemaker_status" = "active" -a \ check_resource httpd started 800 fi - -if [ "$pacemaker_status" = "active" ]; then - # TODO(marios): remove this once +bug/1561012 - # need this on all controllers: - systemctl reload haproxy -fi diff --git a/overcloud.yaml b/overcloud.yaml index cdd7af66..19e847a5 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -17,7 +17,6 @@ parameters: type: string hidden: true AodhPassword: - default: unset description: The password for the aodh services. type: string hidden: true diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 878b31c2..b5694802 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -285,7 +285,11 @@ resources: size: {get_param: CinderLVMLoopDeviceSize} cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend} cinder_iscsi_helper: {get_param: CinderISCSIHelper} - cinder_iscsi_ip_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} + cinder_iscsi_ip_address: + str_replace: + template: "'IP'" + params: + IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 4086fe4e..9b362a85 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -21,7 +21,6 @@ parameters: type: string default: '' AodhPassword: - default: unset description: The password for the aodh services. type: string hidden: true @@ -1249,7 +1248,11 @@ resources: - '/sahara' swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]} swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} - cinder_iscsi_network: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} + cinder_iscsi_network: + str_replace: + template: "'IP'" + params: + IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} cinder_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]} glance_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]} glance_registry_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]} diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 7b681f8e..b271114f 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -18,6 +18,24 @@ Pcmk_resource <| |> { try_sleep => 3, } +# TODO(jistr): use pcs resource provider instead of just no-ops +Service <| + tag == 'aodh-service' or + tag == 'cinder-service' or + tag == 'ceilometer-service' or + tag == 'glance-service' or + tag == 'heat-service' or + tag == 'keystone-service' or + tag == 'neutron-service' or + tag == 'nova-service' or + tag == 'sahara-service' +|> { + hasrestart => true, + restart => '/bin/true', + start => '/bin/true', + stop => '/bin/true', +} + include ::tripleo::packages include ::tripleo::firewall |