diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-27 15:59:52 +0000 |
---|---|---|
committer | Richard Ipsum <richardipsum@fastmail.co.uk> | 2015-04-10 20:17:47 +0100 |
commit | acdf72fa1f20b6ad5c1f51227de26be5cfb272ba (patch) | |
tree | 38f4e295af15796b45028077317c6889996f188e /openstack/usr/lib/systemd | |
parent | 6935a837933c8c462209beab6f6e31bc4f9fb390 (diff) | |
download | definitions-acdf72fa1f20b6ad5c1f51227de26be5cfb272ba.tar.gz |
neutron: Move setup scripts to Ansible
Also change systemd units and configure extension to match this change
Diffstat (limited to 'openstack/usr/lib/systemd')
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service | 13 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-neutron-setup.service | 10 |
2 files changed, 3 insertions, 20 deletions
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service deleted file mode 100644 index 2b1d168b..00000000 --- a/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Configuration script to set Openstack in one node networking -Wants=network-online.target -After=network-online.target openvswitch.service - -[Service] -Type=oneshot -ExecStart=/usr/share/openstack/openstack-neutron-network-configuration-for-one-node -Restart=no -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service index 858e76e9..5833eb70 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service @@ -1,13 +1,9 @@ [Unit] -Description=Run openstack-neutron-setup (once) -Wants=openstack-neutron-network-configuration-one-node.service -After=network-online.target openstack-keystone-setup.service openstack-neutron-network-configuration-one-node.service postgres-server.service +Description=Run neutron-setup Ansible scripts +After=network-online.target openstack-keystone-setup.service postgres-server.service [Service] -Type=oneshot -ExecStart=/usr/share/openstack/openstack-neutron-setup -Restart=no -RemainAfterExit=yes +ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/neutron.yml [Install] WantedBy=multi-user.target |