diff --git a/elements/boot-stack/bin/reset-db b/elements/boot-stack/bin/reset-db index 61821ca7b..c141b021f 100755 --- a/elements/boot-stack/bin/reset-db +++ b/elements/boot-stack/bin/reset-db @@ -1,49 +1,34 @@ #!/bin/bash set -eux -RUN_DB_SYNC=${1:-""} -function run_db_sync() { - [ -n "$RUN_DB_SYNC" ] -} - db_pass=$(os-apply-config --key db-password) PATH=/usr/local/bin:$PATH os-db-create keystone keystone $db_pass -run_db_sync && keystone-manage db_sync if which cinder-manage 1>/dev/null 2>&1; then os-db-create cinder cinder $db_pass - run_db_sync && cinder-manage db sync fi if which ironic-dbsync 1>/dev/null 2>&1; then os-db-create ironic ironic $db_pass - run_db_sync && ironic-dbsync --config-file /etc/ironic/ironic.conf fi if which tuskar-dbsync 1>/dev/null 2>&1; then os-db-create tuskar tuskar $db_pass - run_db_sync && tuskar-dbsync --config-file /etc/tuskar/tuskar.conf fi if which ceilometer-dbsync 1>/dev/null 2>&1; then os-db-create ceilometer ceilometer $db_pass - run_db_sync && ceilometer-dbsync --config-file /etc/ceilometer/ceilometer.conf fi os-db-create nova nova $db_pass -run_db_sync && nova-manage db sync os-db-create nova_bm nova $db_pass -run_db_sync && nova-baremetal-manage db sync os-db-create glance glance $db_pass -run_db_sync && glance-manage db_sync os-db-create heat heat $db_pass -run_db_sync && heat-manage db_sync os-db-create ovs_neutron neutron $db_pass -neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head diff --git a/elements/ceilometer-api/element-deps b/elements/ceilometer-api/element-deps index 2e8e69678..6526fca98 100644 --- a/elements/ceilometer-api/element-deps +++ b/elements/ceilometer-api/element-deps @@ -1,4 +1,5 @@ ceilometer iptables +os-is-bootstrap-host os-refresh-config os-svc-install diff --git a/elements/ceilometer-api/os-refresh-config/configure.d/90-ceilometer-db-sync b/elements/ceilometer-api/os-refresh-config/configure.d/90-ceilometer-db-sync new file mode 100755 index 000000000..b12698950 --- /dev/null +++ b/elements/ceilometer-api/os-refresh-config/configure.d/90-ceilometer-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + ceilometer-dbsync --config-file /etc/ceilometer/ceilometer.conf +fi diff --git a/elements/ceilometer-api/os-refresh-config/post-configure.d/69-ceilometer-api b/elements/ceilometer-api/os-refresh-config/post-configure.d/69-ceilometer-api index 6794ed691..3ffd12652 100755 --- a/elements/ceilometer-api/os-refresh-config/post-configure.d/69-ceilometer-api +++ b/elements/ceilometer-api/os-refresh-config/post-configure.d/69-ceilometer-api @@ -1,8 +1,6 @@ #!/bin/bash set -eux -ceilometer-dbsync --config-file /etc/ceilometer/ceilometer.conf - os-svc-enable -n ceilometer-api [ -d /mnt/state/var/lib/ceilometer ] || install -d -D -m 0770 -o ceilometer -g ceilometer /mnt/state/var/lib/ceilometer diff --git a/elements/cinder-api/element-deps b/elements/cinder-api/element-deps index 97597e3f9..5ad044d38 100644 --- a/elements/cinder-api/element-deps +++ b/elements/cinder-api/element-deps @@ -1,4 +1,5 @@ cinder +os-is-bootstrap-host os-refresh-config os-svc-install source-repositories diff --git a/elements/cinder-api/os-refresh-config/configure.d/90-cinder-db-sync b/elements/cinder-api/os-refresh-config/configure.d/90-cinder-db-sync new file mode 100755 index 000000000..047b033d8 --- /dev/null +++ b/elements/cinder-api/os-refresh-config/configure.d/90-cinder-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + cinder-manage db sync +fi diff --git a/elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api b/elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api index 6155596db..f5e35e449 100755 --- a/elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api +++ b/elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api @@ -1,8 +1,6 @@ #!/bin/bash set -eu -cinder-manage db sync - os-svc-enable -n cinder-api os-svc-enable -n cinder-scheduler os-svc-restart -n cinder-api diff --git a/elements/glance/element-deps b/elements/glance/element-deps index 78c0138fb..e83b87244 100644 --- a/elements/glance/element-deps +++ b/elements/glance/element-deps @@ -1,5 +1,6 @@ iptables os-apply-config +os-is-bootstrap-host os-refresh-config os-svc-install source-repositories diff --git a/elements/glance/os-refresh-config/configure.d/90-glance-db-sync b/elements/glance/os-refresh-config/configure.d/90-glance-db-sync new file mode 100755 index 000000000..dfa370cb8 --- /dev/null +++ b/elements/glance/os-refresh-config/configure.d/90-glance-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + glance-manage db sync +fi diff --git a/elements/glance/os-refresh-config/post-configure.d/75-glance b/elements/glance/os-refresh-config/post-configure.d/75-glance index 295ab0693..55ff46507 100755 --- a/elements/glance/os-refresh-config/post-configure.d/75-glance +++ b/elements/glance/os-refresh-config/post-configure.d/75-glance @@ -1,8 +1,6 @@ #!/bin/bash set -eu -glance-manage db_sync - os-svc-enable -n glance-api os-svc-enable -n glance-reg diff --git a/elements/heat-engine/element-deps b/elements/heat-engine/element-deps index a1c332de0..7e67542b9 100644 --- a/elements/heat-engine/element-deps +++ b/elements/heat-engine/element-deps @@ -1,2 +1,3 @@ heat os-apply-config +os-is-bootstrap-host diff --git a/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync b/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync new file mode 100755 index 000000000..6a7bcff5b --- /dev/null +++ b/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + heat-manage db_sync +fi diff --git a/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine b/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine index 47483e4c7..a7cbf20e7 100755 --- a/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine +++ b/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine @@ -2,8 +2,6 @@ set -e -heat-manage db_sync - os-svc-enable -n heat-engine os-svc-restart -n heat-engine diff --git a/elements/ironic-api/element-deps b/elements/ironic-api/element-deps index 56f3d38b9..260094f62 100644 --- a/elements/ironic-api/element-deps +++ b/elements/ironic-api/element-deps @@ -1,4 +1,5 @@ iptables ironic +os-is-bootstrap-host os-refresh-config os-svc-install diff --git a/elements/ironic-api/os-refresh-config/configure.d/90-ironic-db-sync b/elements/ironic-api/os-refresh-config/configure.d/90-ironic-db-sync new file mode 100755 index 000000000..5e6dd5f15 --- /dev/null +++ b/elements/ironic-api/os-refresh-config/configure.d/90-ironic-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + ironic-dbsync --config-file /etc/ironic/ironic.conf +fi diff --git a/elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api b/elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api index b3b0b5a5c..a2c01fb3b 100755 --- a/elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api +++ b/elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api @@ -1,8 +1,6 @@ #!/bin/bash set -eu -ironic-dbsync --config-file /etc/ironic/ironic.conf - os-svc-enable -n ironic-api service ironic-api restart diff --git a/elements/keystone/element-deps b/elements/keystone/element-deps index 78c0138fb..e83b87244 100644 --- a/elements/keystone/element-deps +++ b/elements/keystone/element-deps @@ -1,5 +1,6 @@ iptables os-apply-config +os-is-bootstrap-host os-refresh-config os-svc-install source-repositories diff --git a/elements/keystone/os-refresh-config/configure.d/90-keystone-db-sync b/elements/keystone/os-refresh-config/configure.d/90-keystone-db-sync new file mode 100755 index 000000000..45cad9553 --- /dev/null +++ b/elements/keystone/os-refresh-config/configure.d/90-keystone-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + keystone-manage db_sync +fi diff --git a/elements/keystone/os-refresh-config/post-configure.d/70-keystone b/elements/keystone/os-refresh-config/post-configure.d/70-keystone index b70004871..06a3e496c 100755 --- a/elements/keystone/os-refresh-config/post-configure.d/70-keystone +++ b/elements/keystone/os-refresh-config/post-configure.d/70-keystone @@ -1,8 +1,6 @@ #!/bin/bash set -eux -keystone-manage db_sync - os-svc-enable -n keystone os-svc-restart -n keystone diff --git a/elements/neutron/element-deps b/elements/neutron/element-deps index 78c0138fb..e83b87244 100644 --- a/elements/neutron/element-deps +++ b/elements/neutron/element-deps @@ -1,5 +1,6 @@ iptables os-apply-config +os-is-bootstrap-host os-refresh-config os-svc-install source-repositories diff --git a/elements/neutron/os-refresh-config/configure.d/90-neutron-db-sync b/elements/neutron/os-refresh-config/configure.d/90-neutron-db-sync new file mode 100755 index 000000000..20351f24e --- /dev/null +++ b/elements/neutron/os-refresh-config/configure.d/90-neutron-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head +fi diff --git a/elements/nova-api/element-deps b/elements/nova-api/element-deps index e20b3d106..03a7de334 100644 --- a/elements/nova-api/element-deps +++ b/elements/nova-api/element-deps @@ -1,3 +1,4 @@ iptables nova nova-novncproxy +os-is-bootstrap-host diff --git a/elements/nova-api/os-refresh-config/configure.d/90-nova-db-sync b/elements/nova-api/os-refresh-config/configure.d/90-nova-db-sync new file mode 100755 index 000000000..3289a1e6d --- /dev/null +++ b/elements/nova-api/os-refresh-config/configure.d/90-nova-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + nova-manage db sync +fi diff --git a/elements/nova-api/os-refresh-config/post-configure.d/80-nova-api b/elements/nova-api/os-refresh-config/post-configure.d/80-nova-api index 5da310f64..2a4950cdc 100755 --- a/elements/nova-api/os-refresh-config/post-configure.d/80-nova-api +++ b/elements/nova-api/os-refresh-config/post-configure.d/80-nova-api @@ -9,8 +9,6 @@ chown -R nova:nova /var/run/openstack mkdir -p /var/run/nova chown -R nova:nova /var/run/nova -nova-manage db sync - os-svc-enable -n nova-conductor os-svc-enable -n nova-api os-svc-enable -n nova-cert diff --git a/elements/nova-baremetal/element-deps b/elements/nova-baremetal/element-deps index 151810bc7..5fa7c1504 100644 --- a/elements/nova-baremetal/element-deps +++ b/elements/nova-baremetal/element-deps @@ -1,4 +1,5 @@ iptables nova-compute os-apply-config +os-is-bootstrap-host os-refresh-config diff --git a/elements/nova-baremetal/os-refresh-config/configure.d/90-nova-baremetal-db-sync b/elements/nova-baremetal/os-refresh-config/configure.d/90-nova-baremetal-db-sync new file mode 100755 index 000000000..bacb09440 --- /dev/null +++ b/elements/nova-baremetal/os-refresh-config/configure.d/90-nova-baremetal-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + nova-baremetal-manage db sync +fi diff --git a/elements/nova-baremetal/os-refresh-config/post-configure.d/80-nova-baremetal b/elements/nova-baremetal/os-refresh-config/post-configure.d/80-nova-baremetal index b38c09ab0..f3ba57cb1 100755 --- a/elements/nova-baremetal/os-refresh-config/post-configure.d/80-nova-baremetal +++ b/elements/nova-baremetal/os-refresh-config/post-configure.d/80-nova-baremetal @@ -1,8 +1,6 @@ #!/bin/bash set -eux -nova-baremetal-manage db sync - os-svc-enable -n nova-baremetal-deploy-helper os-svc-restart -n nova-baremetal-deploy-helper diff --git a/elements/tuskar/element-deps b/elements/tuskar/element-deps index b3563628e..8a9493172 100644 --- a/elements/tuskar/element-deps +++ b/elements/tuskar/element-deps @@ -1,4 +1,5 @@ os-apply-config +os-is-bootstrap-host os-refresh-config os-svc-install source-repositories diff --git a/elements/tuskar/os-refresh-config/configure.d/90-tuskar-db-sync b/elements/tuskar/os-refresh-config/configure.d/90-tuskar-db-sync new file mode 100755 index 000000000..6d2a6ec4c --- /dev/null +++ b/elements/tuskar/os-refresh-config/configure.d/90-tuskar-db-sync @@ -0,0 +1,6 @@ +#!/bin/bash +set -eux + +if os-is-bootstrap-host ; then + tuskar-dbsync --config-file /etc/tuskar/tuskar.conf +fi diff --git a/elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api b/elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api index 9e4a72610..9ce0d2d56 100755 --- a/elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api +++ b/elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api @@ -1,8 +1,6 @@ #!/bin/bash set -eux -tuskar-dbsync --config-file /etc/tuskar/tuskar.conf - os-svc-enable -n tuskar-api service tuskar-api restart