From 6f574d0a0c6fc91888a5198ad412cd75fa38ff21 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 23 Mar 2015 12:11:11 +0000 Subject: neutron: Run Ansible scripts in neutron setup unit --- ...openstack-neutron-network-configuration-one-node.service | 13 ------------- .../usr/lib/systemd/system/openstack-neutron-setup.service | 9 +++------ 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service 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 -- cgit v1.2.1