diff options
3 files changed, 39 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/tasks/keystone_install.yml index ea6926f4..ba4fc28e 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/tasks/keystone_install.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/tasks/keystone_install.yml @@ -26,6 +26,15 @@ state=absent when: ansible_os_family == "Debian" +- name: disable boot auto start + file: + path={{ item }} + state=absent + with_items: + - /etc/init.d/keystone + - /etc/init/keystone.conf + when: ansible_os_family == "Debian" + - name: generate keystone service list lineinfile: dest=/opt/service create=yes line='{{ item }}' with_items: services | union(services_noarch) diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/tasks/keystone_install.yml index ea6926f4..79d02729 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/tasks/keystone_install.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/tasks/keystone_install.yml @@ -26,6 +26,16 @@ state=absent when: ansible_os_family == "Debian" +- name: disable boot auto start + file: + path={{ item }} + state=absent + with_items: + - /etc/init.d/keystone + - /etc/init/keystone.conf + - /lib/systemd/system/keystone.service + when: ansible_os_family == "Debian" + - name: generate keystone service list lineinfile: dest=/opt/service create=yes line='{{ item }}' with_items: services | union(services_noarch) diff --git a/deploy/network.sh b/deploy/network.sh index e3230fa9..46b8c023 100755 --- a/deploy/network.sh +++ b/deploy/network.sh @@ -104,6 +104,23 @@ function setup_baremetal_net() { setup_bridge_net install $INSTALL_NIC } +function setup_network_boot_scripts() { + sudo cp $COMPASS_DIR/deploy/network.sh /usr/sbin/network_setup + sudo chmod +777 /usr/sbin/network_setup + sudo cat << EOF >> /usr/sbin/network_setup + +sleep 2 +save_network_info +clear_forward_rejct_rules +EOF + sudo chmod 755 /usr/sbin/network_setup + + egrep -R "^/usr/sbin/network_setup" /etc/rc.local + if [[ $? != 0 ]]; then + sudo sed -i '/^exit 0/i\/usr\/sbin\/network_setup' /etc/rc.local + fi +} + function create_nets() { setup_nat_net mgmt $MGMT_GW $MGMT_MASK $MGMT_IP_START $MGMT_IP_END @@ -113,4 +130,7 @@ function create_nets() { # create external network setup_bridge_external clear_forward_rejct_rules + + setup_network_boot_scripts } + |