summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-13 15:44:44 +0000
committerGerrit Code Review <review@openstack.org>2017-02-13 15:44:44 +0000
commitd7972df765eb049bc17c2b8f922476dda95cfcc7 (patch)
treebfcebf147c114a12040b12ce488ac68fa01bc8d4 /puppet
parent5071359692f68e7153d181f3f9ceddbb38b6b5b6 (diff)
parentec5ba081c4d19b67df7d90681ebe622b738ceb29 (diff)
Merge "Remove [heat,glance,ironic,cinder,keystone] db sync from ansible"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/cinder-volume.yaml3
-rw-r--r--puppet/services/glance-api.yaml3
-rw-r--r--puppet/services/heat-engine.yaml3
-rw-r--r--puppet/services/ironic-conductor.yaml3
-rw-r--r--puppet/services/keystone.yaml3
5 files changed, 0 insertions, 15 deletions
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index dd1d3833..3a06afb8 100644
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -122,6 +122,3 @@ outputs:
- name: Stop cinder_volume service
tags: step2
service: name=openstack-cinder-volume state=stopped
- - name: Sync cinder_volume DB
- tags: step5
- command: cinder-manage db sync
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index b49b29f7..5b3ab3e4 100644
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -147,6 +147,3 @@ outputs:
- name: Stop and disable glance registry (removed for Ocata)
tags: step2
service: name=openstack-glance-registry state=stopped enabled=no
- - name: Sync glance_api DB
- tags: step5
- command: glance-manage --config-file=/etc/glance/glance-api.conf db_sync
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 3b73eb88..e85b7537 100644
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -144,6 +144,3 @@ outputs:
- name: Stop heat_engine service
tags: step2
service: name=openstack-heat-engine state=stopped
- - name: Sync heat_engine DB
- tags: step5
- command: heat-manage --config-file /etc/heat/heat.conf db_sync
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml
index 48d87209..739db13c 100644
--- a/puppet/services/ironic-conductor.yaml
+++ b/puppet/services/ironic-conductor.yaml
@@ -111,6 +111,3 @@ outputs:
- name: Stop ironic_conductor service
tags: step2
service: name=openstack-ironic-conductor state=stopped
- - name: Sync ironic_conductor DB
- tags: step5
- command: ironic-dbsync
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 7da4a9c2..b2374ec4 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -310,8 +310,5 @@ outputs:
- name: Stop keystone service (running under httpd)
tags: step2
service: name=httpd state=stopped
- - name: Sync keystone DB
- tags: step5
- command: keystone-manage db_sync
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]