diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-30 13:10:46 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-11 18:30:36 +0000 |
| commit | 351f8e7d001f79a0c86c9f6f00a3a2da2a37072d (patch) | |
| tree | 2a67775fc26ec530a112746ec46ea2debd64ba94 | |
| parent | a4d9c63a8c5fb3d9b96baf9000b6b79160e91966 (diff) | |
| download | definitions-351f8e7d001f79a0c86c9f6f00a3a2da2a37072d.tar.gz | |
VERYWIP: not workin: Fix keystone error and other minor fixes
8 files changed, 12 insertions, 5 deletions
diff --git a/openstack-neutron.configure b/openstack-neutron.configure index f7dad9cd..5f5754a9 100644 --- a/openstack-neutron.configure +++ b/openstack-neutron.configure @@ -48,7 +48,6 @@ services=("openstack-neutron-network-configuration-one-node.service" \ "openstack-neutron-dhcp-agent.service" \ "openstack-neutron-l3-agent.service" \ "openstack-neutron-metadata-agent.service" \ - "openstack-neutron-network-configuration-one-node.service" \ "openstack-neutron-ovs-cleanup.service" \ "openstack-neutron-plugin-openvswitch-agent.service" \ "openstack-neutron-server.service" \ diff --git a/openstack/etc/systemd/system/openstack-cinder-setup.service b/openstack/etc/systemd/system/openstack-cinder-setup.service index 86b82848..2bd0a6bb 100644 --- a/openstack/etc/systemd/system/openstack-cinder-setup.service +++ b/openstack/etc/systemd/system/openstack-cinder-setup.service @@ -1,6 +1,6 @@ [Unit] Description=Run openstack-cinder-setup (once) -After=local-fs.target openstack-keystone.service postgres-server.service +After=local-fs.target openstack-keystone-setup.service postgres-server.service [Service] Type=oneshot diff --git a/openstack/etc/systemd/system/openstack-glance-setup.service b/openstack/etc/systemd/system/openstack-glance-setup.service index 7e10119d..ee03c167 100644 --- a/openstack/etc/systemd/system/openstack-glance-setup.service +++ b/openstack/etc/systemd/system/openstack-glance-setup.service @@ -1,6 +1,6 @@ [Unit] Description=Run openstack-glance-setup (once) -After=local-fs.target openstack-keystone.service postgres-server.service +After=local-fs.target openstack-keystone-setup.service postgres-server.service [Service] Type=oneshot diff --git a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service index ae62f40e..c68b3137 100644 --- a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service +++ b/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service @@ -1,10 +1,13 @@ [Unit] Description=Configuration script to set Openstack in one node networking +Wants=network-online.target After=network-online.target openvswitch.service [Service] Type=simple ExecStart=/usr/share/openstack/openstack-neutron-network-configuration-for-one-node +Restart=no +RemainAfterExit=yes [Install] WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service index 290ac3a8..c64eb16d 100644 --- a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service +++ b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service @@ -1,5 +1,6 @@ [Unit] Description=Neutron OVS cleanup +Wants=openstack-neutron-setup.service After=network-online.target openstack-neutron-setup.service [Service] diff --git a/openstack/etc/systemd/system/openstack-neutron-setup.service b/openstack/etc/systemd/system/openstack-neutron-setup.service index be689037..38882e80 100644 --- a/openstack/etc/systemd/system/openstack-neutron-setup.service +++ b/openstack/etc/systemd/system/openstack-neutron-setup.service @@ -1,11 +1,12 @@ [Unit] Description=Run openstack-neutron-setup (once) -After=network-online.target openstack-keystone.service openvswitch-create-links-one-node.service postgres-server.service +After=network-online.target openstack-keystone-setup.service openvswitch-create-links-one-node.service postgres-server.service [Service] Type=oneshot ExecStart=/usr/share/openstack/openstack-neutron-setup Restart=no +RemainAfterExit=yes [Install] WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-setup.service b/openstack/etc/systemd/system/openstack-nova-setup.service index 4b715856..e7a9136f 100644 --- a/openstack/etc/systemd/system/openstack-nova-setup.service +++ b/openstack/etc/systemd/system/openstack-nova-setup.service @@ -1,6 +1,6 @@ [Unit] Description=Run openstack-nova-setup (once) -After=local-fs.target libvirtd.service openstack-keystone.service postgres-server.service +After=local-fs.target libvirtd.service openstack-keystone-setup.service postgres-server.service [Service] Type=oneshot diff --git a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service index 71d5b8f3..d6fa79b3 100644 --- a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service +++ b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service @@ -1,10 +1,13 @@ [Unit] Description=Create Veth pairs +Wants=openstack-neutron-network-configuration-one-node.service After=network-online.target openstack-neutron-network-configuration-one-node.service [Service] Type=simple ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs +RemainAfterExit=yes +Reboot=no [Install] WantedBy=multi-user.target |