diff options
| -rw-r--r-- | capabilities-map.yaml | 5 | ||||
| -rw-r--r-- | docker/services/keystone.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/panko-api.yaml | 6 | ||||
| -rw-r--r-- | roles_data_undercloud.yaml | 1 |
4 files changed, 7 insertions, 7 deletions
diff --git a/capabilities-map.yaml b/capabilities-map.yaml index cc22ff92..3028dcfe 100644 --- a/capabilities-map.yaml +++ b/capabilities-map.yaml @@ -335,11 +335,6 @@ topics: description: Enables Neutron Nuage backend on the controller requires: - overcloud-resource-registry-puppet.yaml - - file: environments/neutron-opencontrail.yaml - title: OpenContrail Extensions - description: Enables OpenContrail extensions - requires: - - overcloud-resource-registry-puppet.yaml - file: environments/neutron-opendaylight.yaml title: OpenDaylight description: Enables OpenDaylight diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 644326e0..e09fd769 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -109,7 +109,7 @@ outputs: start_order: 0 image: *keystone_image user: root - command: ['/bin/bash', '-c', 'mkdir /var/log/httpd && mkdir /var/log/keystone && chown keystone:keystone /var/log/keystone'] + command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && mkdir -p /var/log/keystone && chown keystone:keystone /var/log/keystone'] volumes: - logs:/var/log keystone_db_sync: diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml index 254d7c24..eed98257 100644 --- a/puppet/services/panko-api.yaml +++ b/puppet/services/panko-api.yaml @@ -87,7 +87,7 @@ outputs: upgrade_tasks: - name: Check if httpd is deployed command: systemctl is-enabled httpd - tags: step0,validation + tags: common ignore_errors: True register: httpd_enabled - name: "PreUpgrade step0,validation: Check if httpd is running" @@ -99,3 +99,7 @@ outputs: - name: Stop panko-api service (running under httpd) tags: step1 service: name=httpd state=stopped + when: httpd_enabled.rc == 0 + - name: Install openstack-panko-api package if it was not installed + tags: step3 + yum: name=openstack-panko-api state=latest diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 2759429c..5070ef38 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -26,6 +26,7 @@ - OS::TripleO::Services::MistralExecutor - OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicConductor + - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::NovaIronic - OS::TripleO::Services::Zaqar - OS::TripleO::Services::NeutronServer |