diff options
Diffstat (limited to 'openstack/etc')
| -rw-r--r-- | openstack/etc/cinder/cinder.conf | 2 | ||||
| -rw-r--r-- | openstack/etc/glance/glance-api.conf | 2 | ||||
| -rw-r--r-- | openstack/etc/glance/glance-registry.conf | 2 | ||||
| -rw-r--r-- | openstack/etc/keystone/keystone.conf | 2 | ||||
| -rw-r--r-- | openstack/etc/nova/nova.conf | 3 | ||||
| -rw-r--r-- | openstack/etc/systemd/system/openstack-keystone-setup.service | 4 | ||||
| -rw-r--r-- | openstack/etc/systemd/system/openstack-neutron-setup.service | 4 |
7 files changed, 9 insertions, 10 deletions
diff --git a/openstack/etc/cinder/cinder.conf b/openstack/etc/cinder/cinder.conf index e3bce41d..e849d42e 100644 --- a/openstack/etc/cinder/cinder.conf +++ b/openstack/etc/cinder/cinder.conf @@ -2363,7 +2363,7 @@ volume_group=cinder-volumes # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection -connection=sqlite:////var/lib/cinder/cinder.sqlite +connection=postgresql://##CINDER_DB_USER##:##CINDER_DB_PASSWORD##@127.0.0.1/cinder # The SQLAlchemy connection string to use to connect to the # slave database. (string value) diff --git a/openstack/etc/glance/glance-api.conf b/openstack/etc/glance/glance-api.conf index bec62075..709c9280 100644 --- a/openstack/etc/glance/glance-api.conf +++ b/openstack/etc/glance/glance-api.conf @@ -586,7 +586,7 @@ image_cache_dir = /var/lib/glance/image-cache/ # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection = <None> -connection=sqlite:////var/lib/glance/glance.sqlite +connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@127.0.0.1/glance # The SQL mode to be used for MySQL sessions. This option, # including the default, overrides any server-set SQL mode. To diff --git a/openstack/etc/glance/glance-registry.conf b/openstack/etc/glance/glance-registry.conf index 988c2e79..08a58922 100644 --- a/openstack/etc/glance/glance-registry.conf +++ b/openstack/etc/glance/glance-registry.conf @@ -99,7 +99,7 @@ limit_param_default = 25 # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection = <None> -connection=sqlite:////var/lib/glance/glance.sqlite +connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@127.0.0.1/glance # The SQL mode to be used for MySQL sessions. This option, # including the default, overrides any server-set SQL mode. To diff --git a/openstack/etc/keystone/keystone.conf b/openstack/etc/keystone/keystone.conf index 2295af56..ba837fd9 100644 --- a/openstack/etc/keystone/keystone.conf +++ b/openstack/etc/keystone/keystone.conf @@ -628,7 +628,7 @@ rpc_backend=rabbit # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection=<None> -connection=sqlite:////var/lib/keystone/keystone.sqlite +connection=postgresql://##KEYSTONE_DB_USER##:##KEYSTONE_DB_PASSWORD##@127.0.0.1/keystone # The SQLAlchemy connection string to use to connect to the # slave database. (string value) diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf index b669d2a0..35d103ef 100644 --- a/openstack/etc/nova/nova.conf +++ b/openstack/etc/nova/nova.conf @@ -365,8 +365,7 @@ vnc_keymap="en-us" # DATABASE # ############ [database] -connection=sqlite:////var/lib/nova/nova.sqlite - +connection=postgresql://##NOVA_DB_USER##:##NOVA_DB_PASSWORD##@127.0.0.1/nova ############# # CONDUCTOR # diff --git a/openstack/etc/systemd/system/openstack-keystone-setup.service b/openstack/etc/systemd/system/openstack-keystone-setup.service index 88e3c32e..e7b5377d 100644 --- a/openstack/etc/systemd/system/openstack-keystone-setup.service +++ b/openstack/etc/systemd/system/openstack-keystone-setup.service @@ -1,7 +1,7 @@ [Unit] Description=Run openstack-keystone-setup (once) -Requires=local-fs.target -After=local-fs.target +Requires=local-fs.target postgres-server.service +After=local-fs.target postgres-server.service [Service] Type=oneshot diff --git a/openstack/etc/systemd/system/openstack-neutron-setup.service b/openstack/etc/systemd/system/openstack-neutron-setup.service index ae6da897..c90e7122 100644 --- a/openstack/etc/systemd/system/openstack-neutron-setup.service +++ b/openstack/etc/systemd/system/openstack-neutron-setup.service @@ -1,7 +1,7 @@ [Unit] Description=Run openstack-neutron-setup (once) -Requires=openstack-keystone-setup.service openstack-neutron-network-configuration-one-node.service postgres-server.service -After=openstack-keystone-setup.service openstack-neutron-network-configuration-one-node.service postgres-server.service +Requires=openstack-keystone-setup.service openstack-neutron-network-configuration-one-node.service +After=openstack-keystone-setup.service openstack-neutron-network-configuration-one-node.service [Service] Type=oneshot |