aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/ec2-api.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/services/ec2-api.yaml')
-rw-r--r--puppet/services/ec2-api.yaml12
1 files changed, 11 insertions, 1 deletions
diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml
index 090e0c4d..f6cf13ff 100644
--- a/puppet/services/ec2-api.yaml
+++ b/puppet/services/ec2-api.yaml
@@ -91,6 +91,11 @@ outputs:
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/ec2_api'
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
+ ec2api::api::keystone_ec2_tokens_url:
+ list_join:
+ - ''
+ - - {get_param: [EndpointMap, KeystoneV3Internal, uri]}
+ - '/ec2tokens'
-
if:
- nova_workers_zero
@@ -118,7 +123,7 @@ outputs:
upgrade_tasks:
- name: Check if ec2-api is deployed
command: systemctl is-enabled openstack-ec2-api
- tags: step0,validation
+ tags: common
ignore_errors: True
register: ec2_api_enabled
- name: "PreUpgrade step0,validation: Check if openstack-ec2-api is running"
@@ -129,5 +134,10 @@ outputs:
tags: step0,validation
- name: Stop openstack-ec2-api service
tags: step1
+ when: ec2_api_enabled.rc == 0
service: name=openstack-ec2-api state=stopped
+ - name: Install openstack-ec2-api package if it was disabled
+ tags: step3
+ yum: name=openstack-ec2-api state=latest
+ when: ec2_api_enabled.rc != 0