diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-23 12:11:11 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-25 10:23:46 +0000 |
| commit | 6f574d0a0c6fc91888a5198ad412cd75fa38ff21 (patch) | |
| tree | 315734e910e9ea8d8367bd72626797f82fc79598 | |
| parent | fa833308ab1970f7111a398c7bb73a008a0535a7 (diff) | |
| download | definitions-6f574d0a0c6fc91888a5198ad412cd75fa38ff21.tar.gz | |
neutron: Run Ansible scripts in neutron setup unit
| -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 | 9 |
2 files changed, 3 insertions, 19 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..2e317964 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service @@ -1,13 +1,10 @@ [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/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/neutron.yml ExecStart=/usr/share/openstack/openstack-neutron-setup -Restart=no -RemainAfterExit=yes [Install] WantedBy=multi-user.target |