diff options
222 files changed, 715 insertions, 975 deletions
diff --git a/.travis.yml b/.travis.yml index 16db182..5d5d91a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,13 @@ install: - pip install tox tox-travis codecov - pip install "setuptools>20.0.0" script: +- cd packages/python-google-compute-engine - tox after_success: - codecov + +before_deploy: + cd packages/python-google-compute-engine deploy: provider: pypi user: gc-team diff --git a/packaging/README.md b/daisy_workflows/README.md index e93f50f..e93f50f 100644 --- a/packaging/README.md +++ b/daisy_workflows/README.md diff --git a/packaging/build_deb_packages.sh b/daisy_workflows/build_deb_packages.sh index 38c41d9..38c41d9 100644 --- a/packaging/build_deb_packages.sh +++ b/daisy_workflows/build_deb_packages.sh diff --git a/packaging/build_debian.wf.json b/daisy_workflows/build_debian.wf.json index f3fad62..f3fad62 100644 --- a/packaging/build_debian.wf.json +++ b/daisy_workflows/build_debian.wf.json diff --git a/packaging/build_el6.wf.json b/daisy_workflows/build_el6.wf.json index 07e8471..07e8471 100644 --- a/packaging/build_el6.wf.json +++ b/daisy_workflows/build_el6.wf.json diff --git a/packaging/build_el7.wf.json b/daisy_workflows/build_el7.wf.json index 10700b6..10700b6 100644 --- a/packaging/build_el7.wf.json +++ b/daisy_workflows/build_el7.wf.json diff --git a/packaging/build_el_packages.sh b/daisy_workflows/build_el_packages.sh index a91a468..a91a468 100644 --- a/packaging/build_el_packages.sh +++ b/daisy_workflows/build_el_packages.sh diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control deleted file mode 100644 index 50690e2..0000000 --- a/debian/control +++ /dev/null @@ -1,77 +0,0 @@ -Source: google-compute-image-packages -Section: admin -Priority: optional -Maintainer: Google Cloud Team <gc-team@google.com> -Build-Depends: debhelper (>= 9), - dh-python, - dh-systemd (>= 1.5), - python-all, - python-setuptools, - python3-all, - python3-setuptools, - python-pytest, - python3-pytest, - python-mock, - python-boto, - python3-boto, - python3-distro -Standards-Version: 3.9.8 -Homepage: https://github.com/GoogleCloudPlatform/compute-image-packages - -Package: google-compute-engine -Architecture: all -Depends: google-compute-engine-oslogin, - python:any, - python3:any, - ${python:Depends}, - ${python3:Depends}, - ${misc:Depends}, - python-google-compute-engine (= ${source:Version}), - python3-google-compute-engine (= ${source:Version}), - system-log-daemon, - systemd -Recommends: rsyslog -Provides: irqbalance -Conflicts: google-compute-engine-jessie, - google-compute-engine-init-jessie, - google-config-jessie, - google-compute-engine-stretch, - google-compute-engine-init-stretch, - google-config-stretch, - google-compute-daemon, - google-startup-scripts, - irqbalance -Replaces: google-compute-engine-jessie, - google-compute-engine-init-jessie, - google-config-jessie, - google-compute-engine-stretch, - google-compute-engine-init-stretch, - google-config-stretch, - google-compute-daemon, - google-startup-scripts -Description: Google Compute Engine guest environment. - This package contains scripts, configuration, and systemd init files for features specific to the Google Compute Engine cloud environment. - -Package: python-google-compute-engine -Section: python -Architecture: all -Depends: ${python:Depends}, ${misc:Depends} -Conflicts: google-compute-engine-jessie, - google-compute-engine-stretch, - google-compute-daemon, - google-startup-scripts -Description: Google Compute Engine python library for Python 2.x. - -Package: python3-google-compute-engine -Section: python -Architecture: all -Depends: ${misc:Depends}, - python3-distro | python3-distro-info, - python3-boto, - python3-pkg-resources, - python3:any -Conflicts: google-compute-engine-jessie, - google-compute-engine-stretch, - google-compute-daemon, - google-startup-scripts -Description: Google Compute Engine python library for Python 3.x. diff --git a/debian/google-compute-engine.install b/debian/google-compute-engine.install deleted file mode 100644 index fe6df3f..0000000 --- a/debian/google-compute-engine.install +++ /dev/null @@ -1,9 +0,0 @@ -google_compute_engine_init/systemd/*.service lib/systemd/system -google_compute_engine_init/systemd/90-google-compute-engine.preset lib/systemd/system-preset -google_config/apt/01autoremove-gce etc/apt/apt.conf.d -google_config/apt/99ipv4-only etc/apt/apt.conf.d -google_config/bin/google_set_hostname etc/dhcp/dhclient-exit-hooks.d -google_config/modprobe/gce-blacklist.conf etc/modprobe.d -google_config/rsyslog/* etc/rsyslog.d -google_config/sysctl/* etc/sysctl.d -google_config/udev/* lib/udev/rules.d diff --git a/debian/rules b/debian/rules deleted file mode 100644 index c14a4b8..0000000 --- a/debian/rules +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/make -f - -export PYBUILD_NAME=google-compute-engine -export PYBUILD_TEST_PYTEST=1 -export PYBUILD_TEST_ARGS={dir}/google_compute_engine/ -export PYBUILD_SYSTEM=distutils - -%: - dh $@ --with python2,python3,systemd --buildsystem=pybuild - -override_dh_systemd_start: - # Configured in google-compute-engine.postinst instead. - -override_dh_python3: - dh_python3 - - # Remove the Python 3 entry scripts. - rm -rf debian/python3-google-compute-engine/usr/bin - -override_dh_python2: - dh_python2 - - # Split the Python 2 entry script to the google-compute-engine package. - mkdir -p debian/google-compute-engine/usr/bin - mv debian/python-google-compute-engine/usr/bin/* debian/google-compute-engine/usr/bin/ - rm -rf debian/python-google-compute-engine/usr/bin - -override_dh_clean: - rm -rf google_compute_engine.egg-info - dh_clean diff --git a/google_compute_engine_init/systemd/postinst.sh b/google_compute_engine_init/systemd/postinst.sh deleted file mode 100755 index 01b4f8a..0000000 --- a/google_compute_engine_init/systemd/postinst.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Stop existing daemons. -systemctl stop --no-block google-accounts-daemon -systemctl stop --no-block google-clock-skew-daemon -systemctl stop --no-block google-network-daemon - -# Enable systemd services. -systemctl enable google-accounts-daemon.service -systemctl enable google-clock-skew-daemon.service -systemctl enable google-instance-setup.service -systemctl enable google-network-daemon.service -systemctl enable google-shutdown-scripts.service -systemctl enable google-startup-scripts.service - -# Run instance setup manually to prevent startup script execution. -/usr/bin/google_instance_setup - -# Start daemons. -systemctl start --no-block google-network-daemon -systemctl start --no-block google-accounts-daemon -systemctl start --no-block google-clock-skew-daemon diff --git a/google_compute_engine_init/systemd/prerm.sh b/google_compute_engine_init/systemd/prerm.sh deleted file mode 100755 index e4f8bdd..0000000 --- a/google_compute_engine_init/systemd/prerm.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if [ "$1" = purge ]; then - systemctl stop --no-block google-accounts-daemon - systemctl stop --no-block google-clock-skew-daemon - systemctl stop --no-block google-network-daemon - - systemctl --no-reload disable google-accounts-daemon.service - systemctl --no-reload disable google-clock-skew-daemon.service - systemctl --no-reload disable google-instance-setup.service - systemctl --no-reload disable google-network-daemon.service - systemctl --no-reload disable google-shutdown-scripts.service - systemctl --no-reload disable google-startup-scripts.service -fi diff --git a/google_compute_engine_init/systemd/rpm_replace b/google_compute_engine_init/systemd/rpm_replace deleted file mode 100755 index 2224799..0000000 --- a/google_compute_engine_init/systemd/rpm_replace +++ /dev/null @@ -1,17 +0,0 @@ -# Replace existing guest in EL7. - -# Enable systemd services. -systemctl enable google-accounts-daemon.service -systemctl enable google-clock-skew-daemon.service -systemctl enable google-instance-setup.service -systemctl enable google-network-daemon.service -systemctl enable google-shutdown-scripts.service -systemctl enable google-startup-scripts.service - -# Run instance setup manually. -/usr/bin/google_instance_setup - -# Start daemons. -systemctl start --no-block google-accounts-daemon -systemctl start --no-block google-clock-skew-daemon -systemctl start --no-block google-network-daemon diff --git a/google_compute_engine_init/sysvinit/google-accounts-daemon b/google_compute_engine_init/sysvinit/google-accounts-daemon deleted file mode 100755 index efeff6b..0000000 --- a/google_compute_engine_init/sysvinit/google-accounts-daemon +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -### BEGIN INIT INFO -# Provides: google_accounts_daemon -# Required-Start: $local_fs $network $named $syslog $google_instance_setup -# $google_network_daemon -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -# Short-Description: Google Compute Engine Accounts Daemon -# Description: Manages accounts from metadata SSH keys. -### END INIT INFO - -# Do NOT "set -e". - -NAME=google-accounts-daemon -DAEMON=/usr/bin/google_accounts_daemon -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed. -[ -x "$DAEMON" ] || exit 0 - -# Load the rcS variables. -. /lib/init/vars.sh - -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service. -# -do_start() -{ - start-stop-daemon \ - --background \ - --exec $DAEMON \ - --make-pidfile \ - --pidfile $PIDFILE \ - --quiet \ - --start > /dev/null -} - -# -# Function that stops the daemon/service. -# -do_stop() -{ - start-stop-daemon \ - --exec $DAEMON \ - --pidfile $PIDFILE \ - --quiet \ - --retry=TERM/30/KILL/5 \ - --stop > /dev/null - - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon \ - --exec $DAEMON \ - --oknodo \ - --quiet \ - --retry=0/30/KILL/5 \ - --stop > /dev/null - - # Delete the pidfile when the daemon exits. - rm -f $PIDFILE -} - -case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - do_stop - do_start - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 1 - ;; -esac - -: diff --git a/google_compute_engine_init/sysvinit/google-clock-skew-daemon b/google_compute_engine_init/sysvinit/google-clock-skew-daemon deleted file mode 100755 index 9f7cfc7..0000000 --- a/google_compute_engine_init/sysvinit/google-clock-skew-daemon +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -### BEGIN INIT INFO -# Provides: google_clock_skew_daemon -# Required-Start: $network $syslog $google_instance_setup -# $google_network_daemon -# Required-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Google Compute Engine Clock Skew Daemon -# Description: Sync the system clock on migration. -### END INIT INFO - -# Do NOT "set -e". - -NAME=google-clock-skew-daemon -DAEMON=/usr/bin/google_clock_skew_daemon -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed. -[ -x "$DAEMON" ] || exit 0 - -# Load the rcS variables. -. /lib/init/vars.sh - -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service. -# -do_start() -{ - start-stop-daemon \ - --background \ - --exec $DAEMON \ - --make-pidfile \ - --pidfile $PIDFILE \ - --quiet \ - --start > /dev/null -} - -# -# Function that stops the daemon/service. -# -do_stop() -{ - start-stop-daemon \ - --exec $DAEMON \ - --pidfile $PIDFILE \ - --quiet \ - --retry=TERM/30/KILL/5 \ - --stop > /dev/null - - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon \ - --exec $DAEMON \ - --oknodo \ - --quiet \ - --retry=0/30/KILL/5 \ - --stop > /dev/null - - # Delete the pidfile when the daemon exits. - rm -f $PIDFILE -} - -case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - do_stop - do_start - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 1 - ;; -esac - -: diff --git a/google_compute_engine_init/sysvinit/google-instance-setup b/google_compute_engine_init/sysvinit/google-instance-setup deleted file mode 100755 index 4382f25..0000000 --- a/google_compute_engine_init/sysvinit/google-instance-setup +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -### BEGIN INIT INFO -# Provides: google_instance_setup -# X-Start-Before: ssh -# Required-Start: $local_fs $network $syslog -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -# Short-Description: Google Compute Engine Instance Setup -# Description: Runs instance setup on boot. -### END INIT INFO - -NAME=google-instance-setup -SCRIPTNAME=/etc/init.d/$NAME - -# Load the rcS variables. -. /lib/init/vars.sh - -# -# Function that starts the daemon/service. -# -do_start() -{ - /usr/bin/google_instance_setup > /dev/null -} - -case "$1" in - start) - do_start - ;; - *) - echo "Usage: $SCRIPTNAME start" >&2 - exit 1 - ;; -esac - -: diff --git a/google_compute_engine_init/sysvinit/google-network-daemon b/google_compute_engine_init/sysvinit/google-network-daemon deleted file mode 100644 index 84ef3e6..0000000 --- a/google_compute_engine_init/sysvinit/google-network-daemon +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -### BEGIN INIT INFO -# Provides: google_network_daemon -# Required-Start: $network $syslog $google_instance_setup -# Required-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Google Compute Engine Network Setup and Daemon -# Description: Enables Networks on boot and manages Networking. -### END INIT INFO - -# Do NOT "set -e". - -NAME=google-network-daemon -DAEMON=/usr/bin/google_network_daemon -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed. -[ -x "$DAEMON" ] || exit 0 - -# Load the rcS variables. -. /lib/init/vars.sh - -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service. -# -do_start() -{ - start-stop-daemon \ - --background \ - --exec $DAEMON \ - --make-pidfile \ - --pidfile $PIDFILE \ - --quiet \ - --start > /dev/null -} - -# -# Function that stops the daemon/service. -# -do_stop() -{ - start-stop-daemon \ - --exec $DAEMON \ - --pidfile $PIDFILE \ - --quiet \ - --retry=TERM/30/KILL/5 \ - --stop > /dev/null - - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon \ - --exec $DAEMON \ - --oknodo \ - --quiet \ - --retry=0/30/KILL/5 \ - --stop > /dev/null - - # Delete the pidfile when the daemon exits. - rm -f $PIDFILE -} - -case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - do_stop - do_start - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 1 - ;; -esac - -: diff --git a/google_compute_engine_init/sysvinit/google-shutdown-scripts b/google_compute_engine_init/sysvinit/google-shutdown-scripts deleted file mode 100755 index 3f93799..0000000 --- a/google_compute_engine_init/sysvinit/google-shutdown-scripts +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -### BEGIN INIT INFO -# Provides: google_shutdown_scripts -# Required-Start: -# Required-Stop: $remote_fs $syslog docker kubelet -# Default-Start: -# Default-Stop: 0 6 -# Short-Description: Google Compute Engine Shutdown Scripts -# Description: Runs user specified shutdown scripts from metadata. -### END INIT INFO - -NAME=google-shutdown-scripts -SCRIPTNAME=/etc/init.d/$NAME - -# Load the rcS variables. -. /lib/init/vars.sh - -# -# Function that stops the daemon/service. -# -do_stop() -{ - /usr/bin/google_metadata_script_runner --script-type shutdown > /dev/null -} - -case "$1" in - stop) - do_stop - ;; - *) - echo "Usage: $SCRIPTNAME stop" >&2 - exit 1 - ;; -esac - -: diff --git a/google_compute_engine_init/sysvinit/google-startup-scripts b/google_compute_engine_init/sysvinit/google-startup-scripts deleted file mode 100755 index e7c5be0..0000000 --- a/google_compute_engine_init/sysvinit/google-startup-scripts +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -### BEGIN INIT INFO -# Provides: google_startup_scripts -# Required-Start: $all $google_instance_setup $google_network_daemon -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -# Short-Description: Google Compute Engine Startup Scripts -# Description: Runs user specified startup scripts from metadata. -### END INIT INFO - -NAME=google-startup-scripts -SCRIPTNAME=/etc/init.d/$NAME - -# Load the rcS variables. -. /lib/init/vars.sh - -# -# Function that starts the daemon/service. -# -do_start() -{ - /usr/bin/google_metadata_script_runner --script-type startup > /dev/null -} - -case "$1" in - start) - do_start - ;; - *) - echo "Usage: $SCRIPTNAME start" >&2 - exit 1 - ;; -esac - -: diff --git a/google_compute_engine_init/sysvinit/postinst.sh b/google_compute_engine_init/sysvinit/postinst.sh deleted file mode 100755 index 02b5a7e..0000000 --- a/google_compute_engine_init/sysvinit/postinst.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -update-rc.d google-accounts-daemon defaults -update-rc.d google-clock-skew-daemon defaults -update-rc.d google-instance-setup defaults -update-rc.d google-network-daemon defaults -update-rc.d google-shutdown-scripts defaults -update-rc.d google-startup-scripts defaults - -# Run instance setup. -/etc/init.d/google-instance-setup start diff --git a/google_compute_engine_init/sysvinit/prerm.sh b/google_compute_engine_init/sysvinit/prerm.sh deleted file mode 100755 index a501cb6..0000000 --- a/google_compute_engine_init/sysvinit/prerm.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if [ "$1" = purge ]; then - update-rc.d google-accounts-daemon remove - update-rc.d google-clock-skew-daemon remove - update-rc.d google-instance-setup remove - update-rc.d google-network-daemon remove - update-rc.d google-ip-forwarding-daemon remove - update-rc.d google-shutdown-scripts defaults - update-rc.d google-startup-scripts defaults -fi diff --git a/google_compute_engine_init/sysvinit/rpm_replace b/google_compute_engine_init/sysvinit/rpm_replace deleted file mode 100755 index a19fc2d..0000000 --- a/google_compute_engine_init/sysvinit/rpm_replace +++ /dev/null @@ -1,5 +0,0 @@ -# Replace existing guest. - -# Run instance setup. -/usr/bin/google_instance_setup - diff --git a/google_compute_engine_init/upstart/postinst.sh b/google_compute_engine_init/upstart/postinst.sh deleted file mode 100755 index dfa1b45..0000000 --- a/google_compute_engine_init/upstart/postinst.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Stop existing daemons -stop --no-wait google-accounts-daemon -stop --no-wait google-clock-skew-daemon -stop --no-wait google-network-daemon - -# Run instance setup manually to prevent startup script execution. -/usr/bin/google_instance_setup - -# Start daemons -start --no-wait google-accounts-daemon -start --no-wait google-clock-skew-daemon -start --no-wait google-network-daemon diff --git a/google_compute_engine_init/upstart/prerm.sh b/google_compute_engine_init/upstart/prerm.sh deleted file mode 100755 index e2f5611..0000000 --- a/google_compute_engine_init/upstart/prerm.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if [ "$1" = purge ]; then - stop --no-wait google-accounts-daemon - stop --no-wait google-clock-skew-daemon - stop --no-wait google-network-daemon - stop --no-wait google-ip-forwarding-daemon -fi diff --git a/google_compute_engine_init/upstart/rpm_replace b/google_compute_engine_init/upstart/rpm_replace deleted file mode 100755 index 6b4c42b..0000000 --- a/google_compute_engine_init/upstart/rpm_replace +++ /dev/null @@ -1,9 +0,0 @@ -# Replace existing guest in EL6. - -# Run instance setup. -/usr/bin/google_instance_setup - -# Manually start daemons. -start --no-wait google-accounts-daemon -start --no-wait google-clock-skew-daemon -start --no-wait google-network-daemon diff --git a/gce-disk-expand/README.md b/packages/gce-disk-expand/README.md index 276e790..276e790 100644 --- a/gce-disk-expand/README.md +++ b/packages/gce-disk-expand/README.md diff --git a/gce-disk-expand/dracut6_7.sh b/packages/gce-disk-expand/dracut6_7.sh index e414670..e414670 100755 --- a/gce-disk-expand/dracut6_7.sh +++ b/packages/gce-disk-expand/dracut6_7.sh diff --git a/gce-disk-expand/packaging/debian/changelog b/packages/gce-disk-expand/packaging/debian/changelog index b93feb2..b93feb2 100644 --- a/gce-disk-expand/packaging/debian/changelog +++ b/packages/gce-disk-expand/packaging/debian/changelog diff --git a/gce-disk-expand/packaging/debian/compat b/packages/gce-disk-expand/packaging/debian/compat index ec63514..ec63514 100644 --- a/gce-disk-expand/packaging/debian/compat +++ b/packages/gce-disk-expand/packaging/debian/compat diff --git a/gce-disk-expand/packaging/debian/control b/packages/gce-disk-expand/packaging/debian/control index 1b18aef..1b18aef 100644 --- a/gce-disk-expand/packaging/debian/control +++ b/packages/gce-disk-expand/packaging/debian/control diff --git a/gce-disk-expand/packaging/debian/copyright b/packages/gce-disk-expand/packaging/debian/copyright index 14d05cc..14d05cc 100644 --- a/gce-disk-expand/packaging/debian/copyright +++ b/packages/gce-disk-expand/packaging/debian/copyright diff --git a/gce-disk-expand/packaging/debian/install b/packages/gce-disk-expand/packaging/debian/install index e621f63..e621f63 100644 --- a/gce-disk-expand/packaging/debian/install +++ b/packages/gce-disk-expand/packaging/debian/install diff --git a/gce-disk-expand/packaging/debian/postinst b/packages/gce-disk-expand/packaging/debian/postinst index 00f5b1e..00f5b1e 100644 --- a/gce-disk-expand/packaging/debian/postinst +++ b/packages/gce-disk-expand/packaging/debian/postinst diff --git a/gce-disk-expand/packaging/debian/rules b/packages/gce-disk-expand/packaging/debian/rules index 2d33f6a..2d33f6a 100755 --- a/gce-disk-expand/packaging/debian/rules +++ b/packages/gce-disk-expand/packaging/debian/rules diff --git a/gce-disk-expand/packaging/gce-disk-expand.spec b/packages/gce-disk-expand/packaging/gce-disk-expand.spec index dec024e..dec024e 100644 --- a/gce-disk-expand/packaging/gce-disk-expand.spec +++ b/packages/gce-disk-expand/packaging/gce-disk-expand.spec diff --git a/gce-disk-expand/packaging/setup_deb.sh b/packages/gce-disk-expand/packaging/setup_deb.sh index 0764d1f..0764d1f 100755 --- a/gce-disk-expand/packaging/setup_deb.sh +++ b/packages/gce-disk-expand/packaging/setup_deb.sh diff --git a/gce-disk-expand/packaging/setup_rpm.sh b/packages/gce-disk-expand/packaging/setup_rpm.sh index 52f6a36..52f6a36 100755 --- a/gce-disk-expand/packaging/setup_rpm.sh +++ b/packages/gce-disk-expand/packaging/setup_rpm.sh diff --git a/gce-disk-expand/src/expandfs-lib.sh b/packages/gce-disk-expand/src/expandfs-lib.sh index 5126602..5126602 100755 --- a/gce-disk-expand/src/expandfs-lib.sh +++ b/packages/gce-disk-expand/src/expandfs-lib.sh diff --git a/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/check b/packages/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/check index 7f7d65c..7f7d65c 100755 --- a/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/check +++ b/packages/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/check diff --git a/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/expand_rootfs.sh b/packages/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/expand_rootfs.sh index 055f083..055f083 100755 --- a/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/expand_rootfs.sh +++ b/packages/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/expand_rootfs.sh diff --git a/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/install b/packages/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/install index 4b68069..4b68069 100755 --- a/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/install +++ b/packages/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/install diff --git a/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/xfs_growfs.sh b/packages/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/xfs_growfs.sh index af8d05d..af8d05d 100755 --- a/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/xfs_growfs.sh +++ b/packages/gce-disk-expand/src/usr/share/dracut/modules.d/50expand_rootfs/xfs_growfs.sh diff --git a/gce-disk-expand/src/usr/share/initramfs-tools/hooks/expand-rootfs b/packages/gce-disk-expand/src/usr/share/initramfs-tools/hooks/expand-rootfs index b1f38b7..b1f38b7 100755 --- a/gce-disk-expand/src/usr/share/initramfs-tools/hooks/expand-rootfs +++ b/packages/gce-disk-expand/src/usr/share/initramfs-tools/hooks/expand-rootfs diff --git a/gce-disk-expand/src/usr/share/initramfs-tools/scripts/local-bottom/xfs_growfs b/packages/gce-disk-expand/src/usr/share/initramfs-tools/scripts/local-bottom/xfs_growfs index f27fb13..f27fb13 100755 --- a/gce-disk-expand/src/usr/share/initramfs-tools/scripts/local-bottom/xfs_growfs +++ b/packages/gce-disk-expand/src/usr/share/initramfs-tools/scripts/local-bottom/xfs_growfs diff --git a/gce-disk-expand/src/usr/share/initramfs-tools/scripts/local-premount/expand_rootfs b/packages/gce-disk-expand/src/usr/share/initramfs-tools/scripts/local-premount/expand_rootfs index c95f50d..c95f50d 100755 --- a/gce-disk-expand/src/usr/share/initramfs-tools/scripts/local-premount/expand_rootfs +++ b/packages/gce-disk-expand/src/usr/share/initramfs-tools/scripts/local-premount/expand_rootfs diff --git a/google_compute_engine_oslogin/Makefile b/packages/google-compute-engine-oslogin/Makefile index c838166..c838166 100644 --- a/google_compute_engine_oslogin/Makefile +++ b/packages/google-compute-engine-oslogin/Makefile diff --git a/google_compute_engine_oslogin/README.md b/packages/google-compute-engine-oslogin/README.md index ce15018..ce15018 100644 --- a/google_compute_engine_oslogin/README.md +++ b/packages/google-compute-engine-oslogin/README.md diff --git a/google_compute_engine_oslogin/authorized_keys/authorized_keys.cc b/packages/google-compute-engine-oslogin/authorized_keys/authorized_keys.cc index 24d1b26..24d1b26 100644 --- a/google_compute_engine_oslogin/authorized_keys/authorized_keys.cc +++ b/packages/google-compute-engine-oslogin/authorized_keys/authorized_keys.cc diff --git a/google_compute_engine_oslogin/bin/google_oslogin_control b/packages/google-compute-engine-oslogin/bin/google_oslogin_control index 65c0f15..65c0f15 100644 --- a/google_compute_engine_oslogin/bin/google_oslogin_control +++ b/packages/google-compute-engine-oslogin/bin/google_oslogin_control diff --git a/google_compute_engine_oslogin/libnss_cache_oslogin/compat/getpwent_r.c b/packages/google-compute-engine-oslogin/libnss_cache_oslogin/compat/getpwent_r.c index b1be6fc..b1be6fc 100644 --- a/google_compute_engine_oslogin/libnss_cache_oslogin/compat/getpwent_r.c +++ b/packages/google-compute-engine-oslogin/libnss_cache_oslogin/compat/getpwent_r.c diff --git a/google_compute_engine_oslogin/libnss_cache_oslogin/nss_cache_oslogin.c b/packages/google-compute-engine-oslogin/libnss_cache_oslogin/nss_cache_oslogin.c index 56fe8a0..56fe8a0 100644 --- a/google_compute_engine_oslogin/libnss_cache_oslogin/nss_cache_oslogin.c +++ b/packages/google-compute-engine-oslogin/libnss_cache_oslogin/nss_cache_oslogin.c diff --git a/google_compute_engine_oslogin/libnss_cache_oslogin/nss_cache_oslogin.h b/packages/google-compute-engine-oslogin/libnss_cache_oslogin/nss_cache_oslogin.h index 25c7274..25c7274 100644 --- a/google_compute_engine_oslogin/libnss_cache_oslogin/nss_cache_oslogin.h +++ b/packages/google-compute-engine-oslogin/libnss_cache_oslogin/nss_cache_oslogin.h diff --git a/google_compute_engine_oslogin/nss_cache/nss_cache.cc b/packages/google-compute-engine-oslogin/nss_cache/nss_cache.cc index a720859..a720859 100644 --- a/google_compute_engine_oslogin/nss_cache/nss_cache.cc +++ b/packages/google-compute-engine-oslogin/nss_cache/nss_cache.cc diff --git a/google_compute_engine_oslogin/nss_module/nss_oslogin.cc b/packages/google-compute-engine-oslogin/nss_module/nss_oslogin.cc index d808a6f..d808a6f 100644 --- a/google_compute_engine_oslogin/nss_module/nss_oslogin.cc +++ b/packages/google-compute-engine-oslogin/nss_module/nss_oslogin.cc diff --git a/google_compute_engine_oslogin/packaging/debian/changelog b/packages/google-compute-engine-oslogin/packaging/debian/changelog index 45e2b3e..45e2b3e 100644 --- a/google_compute_engine_oslogin/packaging/debian/changelog +++ b/packages/google-compute-engine-oslogin/packaging/debian/changelog diff --git a/google_compute_engine_oslogin/packaging/debian/compat b/packages/google-compute-engine-oslogin/packaging/debian/compat index ec63514..ec63514 100644 --- a/google_compute_engine_oslogin/packaging/debian/compat +++ b/packages/google-compute-engine-oslogin/packaging/debian/compat diff --git a/google_compute_engine_oslogin/packaging/debian/control b/packages/google-compute-engine-oslogin/packaging/debian/control index a8d0064..a8d0064 100644 --- a/google_compute_engine_oslogin/packaging/debian/control +++ b/packages/google-compute-engine-oslogin/packaging/debian/control diff --git a/google_compute_engine_oslogin/packaging/debian/copyright b/packages/google-compute-engine-oslogin/packaging/debian/copyright index f1c5775..f1c5775 100644 --- a/google_compute_engine_oslogin/packaging/debian/copyright +++ b/packages/google-compute-engine-oslogin/packaging/debian/copyright diff --git a/google_compute_engine_oslogin/packaging/debian/google-compute-engine-oslogin.links b/packages/google-compute-engine-oslogin/packaging/debian/google-compute-engine-oslogin.links index fd75bc5..fd75bc5 100644 --- a/google_compute_engine_oslogin/packaging/debian/google-compute-engine-oslogin.links +++ b/packages/google-compute-engine-oslogin/packaging/debian/google-compute-engine-oslogin.links diff --git a/google_compute_engine_oslogin/packaging/debian/rules b/packages/google-compute-engine-oslogin/packaging/debian/rules index 65b1f4b..65b1f4b 100755 --- a/google_compute_engine_oslogin/packaging/debian/rules +++ b/packages/google-compute-engine-oslogin/packaging/debian/rules diff --git a/debian/source/format b/packages/google-compute-engine-oslogin/packaging/debian/source/format index 163aaf8..163aaf8 100644 --- a/debian/source/format +++ b/packages/google-compute-engine-oslogin/packaging/debian/source/format diff --git a/google_compute_engine_oslogin/packaging/google-compute-engine-oslogin.spec b/packages/google-compute-engine-oslogin/packaging/google-compute-engine-oslogin.spec index f3a12e6..f3a12e6 100644 --- a/google_compute_engine_oslogin/packaging/google-compute-engine-oslogin.spec +++ b/packages/google-compute-engine-oslogin/packaging/google-compute-engine-oslogin.spec diff --git a/google_compute_engine_oslogin/packaging/setup_deb.sh b/packages/google-compute-engine-oslogin/packaging/setup_deb.sh index 3c41f20..3c41f20 100755 --- a/google_compute_engine_oslogin/packaging/setup_deb.sh +++ b/packages/google-compute-engine-oslogin/packaging/setup_deb.sh diff --git a/google_compute_engine_oslogin/packaging/setup_rpm.sh b/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh index 640b9e2..640b9e2 100755 --- a/google_compute_engine_oslogin/packaging/setup_rpm.sh +++ b/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh diff --git a/google_compute_engine_oslogin/pam_module/pam_oslogin_admin.cc b/packages/google-compute-engine-oslogin/pam_module/pam_oslogin_admin.cc index 0b5f3c0..0b5f3c0 100644 --- a/google_compute_engine_oslogin/pam_module/pam_oslogin_admin.cc +++ b/packages/google-compute-engine-oslogin/pam_module/pam_oslogin_admin.cc diff --git a/google_compute_engine_oslogin/pam_module/pam_oslogin_login.cc b/packages/google-compute-engine-oslogin/pam_module/pam_oslogin_login.cc index fa1b151..fa1b151 100644 --- a/google_compute_engine_oslogin/pam_module/pam_oslogin_login.cc +++ b/packages/google-compute-engine-oslogin/pam_module/pam_oslogin_login.cc diff --git a/google_compute_engine_oslogin/policy/Makefile b/packages/google-compute-engine-oslogin/policy/Makefile index c858c9d..c858c9d 100644 --- a/google_compute_engine_oslogin/policy/Makefile +++ b/packages/google-compute-engine-oslogin/policy/Makefile diff --git a/google_compute_engine_oslogin/policy/README.md b/packages/google-compute-engine-oslogin/policy/README.md index b2cc5a9..b2cc5a9 100644 --- a/google_compute_engine_oslogin/policy/README.md +++ b/packages/google-compute-engine-oslogin/policy/README.md diff --git a/google_compute_engine_oslogin/policy/oslogin.fc b/packages/google-compute-engine-oslogin/policy/oslogin.fc index 3e70358..3e70358 100644 --- a/google_compute_engine_oslogin/policy/oslogin.fc +++ b/packages/google-compute-engine-oslogin/policy/oslogin.fc diff --git a/google_compute_engine_oslogin/policy/oslogin.pp b/packages/google-compute-engine-oslogin/policy/oslogin.pp Binary files differindex 6ec6ed0..6ec6ed0 100644 --- a/google_compute_engine_oslogin/policy/oslogin.pp +++ b/packages/google-compute-engine-oslogin/policy/oslogin.pp diff --git a/google_compute_engine_oslogin/policy/oslogin.te b/packages/google-compute-engine-oslogin/policy/oslogin.te index 381f769..381f769 100644 --- a/google_compute_engine_oslogin/policy/oslogin.te +++ b/packages/google-compute-engine-oslogin/policy/oslogin.te diff --git a/google_compute_engine_oslogin/utils/oslogin_utils.cc b/packages/google-compute-engine-oslogin/utils/oslogin_utils.cc index f035adb..f035adb 100644 --- a/google_compute_engine_oslogin/utils/oslogin_utils.cc +++ b/packages/google-compute-engine-oslogin/utils/oslogin_utils.cc diff --git a/google_compute_engine_oslogin/utils/oslogin_utils.h b/packages/google-compute-engine-oslogin/utils/oslogin_utils.h index 3788521..3788521 100644 --- a/google_compute_engine_oslogin/utils/oslogin_utils.h +++ b/packages/google-compute-engine-oslogin/utils/oslogin_utils.h diff --git a/google_compute_engine_oslogin/utils/oslogin_utils_test.cc b/packages/google-compute-engine-oslogin/utils/oslogin_utils_test.cc index ecc4c11..ecc4c11 100644 --- a/google_compute_engine_oslogin/utils/oslogin_utils_test.cc +++ b/packages/google-compute-engine-oslogin/utils/oslogin_utils_test.cc diff --git a/google_compute_engine_oslogin/utils/run_tests.sh b/packages/google-compute-engine-oslogin/utils/run_tests.sh index 83adcdc..83adcdc 100755 --- a/google_compute_engine_oslogin/utils/run_tests.sh +++ b/packages/google-compute-engine-oslogin/utils/run_tests.sh diff --git a/debian/changelog b/packages/google-compute-engine/packaging/debian/changelog index 33d12fb..37f97c6 100644 --- a/debian/changelog +++ b/packages/google-compute-engine/packaging/debian/changelog @@ -1,4 +1,4 @@ -google-compute-image-packages (2.8.12-1) stable; urgency=low +google-compute-engine (2.8.12-1) stable; urgency=low * Fix two factor enablement on change. diff --git a/packages/google-compute-engine/packaging/debian/compat b/packages/google-compute-engine/packaging/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/packages/google-compute-engine/packaging/debian/compat @@ -0,0 +1 @@ +9 diff --git a/packages/google-compute-engine/packaging/debian/control b/packages/google-compute-engine/packaging/debian/control new file mode 100644 index 0000000..3f647fe --- /dev/null +++ b/packages/google-compute-engine/packaging/debian/control @@ -0,0 +1,37 @@ +Source: google-compute-engine +Section: admin +Priority: optional +Maintainer: Google Cloud Team <gc-team@google.com> +Build-Depends: debhelper (>= 9), + dh-systemd (>= 1.5) +Standards-Version: 3.9.8 +Homepage: https://github.com/GoogleCloudPlatform/compute-image-packages + +Package: google-compute-engine +Architecture: all +Depends: google-compute-engine-oslogin, + ${misc:Depends}, + rsyslog | system-log-daemon, + systemd +Recommends: rsyslog +Provides: irqbalance +Conflicts: google-compute-engine-jessie, + google-compute-engine-init-jessie, + google-config-jessie, + google-compute-engine-stretch, + google-compute-engine-init-stretch, + google-config-stretch, + google-compute-daemon, + google-startup-scripts, + irqbalance +Replaces: google-compute-engine-jessie, + google-compute-engine-init-jessie, + google-config-jessie, + google-compute-engine-stretch, + google-compute-engine-init-stretch, + google-config-stretch, + google-compute-daemon, + google-startup-scripts +Description: Google Compute Engine guest environment. + This package contains scripts, configuration, and systemd init files for + features specific to the Google Compute Engine cloud environment. diff --git a/debian/copyright b/packages/google-compute-engine/packaging/debian/copyright index 9f4356b..9f4356b 100644 --- a/debian/copyright +++ b/packages/google-compute-engine/packaging/debian/copyright diff --git a/packages/google-compute-engine/packaging/debian/install b/packages/google-compute-engine/packaging/debian/install new file mode 100644 index 0000000..f95892b --- /dev/null +++ b/packages/google-compute-engine/packaging/debian/install @@ -0,0 +1,9 @@ +etc/apt/apt.conf.d/* +etc/dhcp/dhclient-exit-hooks.d/* +etc/modprobe.d/* +etc/rsyslog.d/* +etc/sysctl.d/* +lib/systemd/system/* +lib/systemd/system-preset/* +lib/udev/rules.d/* +usr/bin/* diff --git a/debian/google-compute-engine.postinst b/packages/google-compute-engine/packaging/debian/postinst index c00b76e..c00b76e 100644 --- a/debian/google-compute-engine.postinst +++ b/packages/google-compute-engine/packaging/debian/postinst diff --git a/debian/google-compute-engine.preinst b/packages/google-compute-engine/packaging/debian/preinst index bffafd5..2f04366 100644 --- a/debian/google-compute-engine.preinst +++ b/packages/google-compute-engine/packaging/debian/preinst @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +#DEBHELPER# + set -e if [ -d /run/systemd/system ] ; then if [ "$1" = upgrade ]; then diff --git a/debian/google-compute-engine.prerm b/packages/google-compute-engine/packaging/debian/prerm index 0f26f88..e8ac50d 100644 --- a/debian/google-compute-engine.prerm +++ b/packages/google-compute-engine/packaging/debian/prerm @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +#DEBHELPER# + # Stop all services on remove. set -e if [ -d /run/systemd/system ] && [ "$1" = remove ]; then diff --git a/packages/google-compute-engine/packaging/debian/rules b/packages/google-compute-engine/packaging/debian/rules new file mode 100644 index 0000000..d82bff9 --- /dev/null +++ b/packages/google-compute-engine/packaging/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +%: + dh $@ --with systemd + +override_dh_systemd_start: + # Configured in postinst. diff --git a/google_compute_engine_oslogin/packaging/debian/source/format b/packages/google-compute-engine/packaging/debian/source/format index 163aaf8..163aaf8 100644 --- a/google_compute_engine_oslogin/packaging/debian/source/format +++ b/packages/google-compute-engine/packaging/debian/source/format diff --git a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec new file mode 100644 index 0000000..a4c4084 --- /dev/null +++ b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec @@ -0,0 +1,90 @@ +# Copyright 2017 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Name: google-compute-engine +Version: %{_version} +Release: 1.el6 +Summary: Google Compute Engine guest environment. +License: ASL 2.0 +Url: https://github.com/GoogleCloudPlatform/compute-image-packages +Source0: %{name}_%{version}.orig.tar.gz +Requires: curl +Requires: google-compute-engine-oslogin +Requires: python-google-compute-engine = %{version} +Requires: rsyslog +# Old packages. +Obsoletes: google-compute-engine-init +Obsoletes: google-config +Obsoletes: google-startup-scripts + +BuildArch: noarch + +# Allow other files in the source that don't end up in the package. +%define _unpackaged_files_terminate_build 0 + +%description +This package contains scripts, configuration, and init files for features +specific to the Google Compute Engine cloud environment. + +%prep +%autosetup + +%install +cp -a src/{etc,usr} %{buildroot} +install -d %{buildroot}/lib/ +cp -a src/lib/udev %{buildroot}/lib + +%files +%defattr(0644,root,root,0755) +%attr(0755,-,-) %{_bindir}/* +%attr(0755,-,-) %{_sbindir}/* +/lib/udev/rules.d/* +/etc/init/*.conf +/etc/dhcp/dhclient-exit-hooks +%config /etc/modprobe.d/* +%config /etc/rsyslog.d/* +%config /etc/sysctl.d/* + +%post +if [ $1 -eq 2 ]; then + # New service might not be enabled during upgrade. + systemctl enable google-network-daemon.service +fi + +# On upgrade run instance setup again to handle any new configs and restart +# daemons. +if [ $1 -eq 2 ]; then + stop -q -n google-accounts-daemon + stop -q -n google-clock-skew-daemon + stop -q -n google-network-daemon + /usr/bin/google_instance_setup + start -q -n google-accounts-daemon + start -q -n google-clock-skew-daemon + start -q -n google-network-daemon +fi + +if initctl status google-ip-forwarding-daemon | grep -q 'running'; then + stop -q -n google-ip-forwarding-daemon +fi + +%preun +# On uninstall only. +if [ $1 -eq 0 ]; then + stop -q -n google-accounts-daemon + stop -q -n google-clock-skew-daemon + stop -q -n google-network-daemon + if initctl status google-ip-forwarding-daemon | grep -q 'running'; then + stop -q -n google-ip-forwarding-daemon + fi +fi diff --git a/packages/google-compute-engine/packaging/google-compute-engine.spec b/packages/google-compute-engine/packaging/google-compute-engine.spec new file mode 100644 index 0000000..39307cb --- /dev/null +++ b/packages/google-compute-engine/packaging/google-compute-engine.spec @@ -0,0 +1,95 @@ +# Copyright 2018 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Name: google-compute-engine +Version: %{_version} +Release: 1.el7 +Summary: Google Compute Engine guest environment. +License: ASL 2.0 +Url: https://github.com/GoogleCloudPlatform/compute-image-packages +Source0: %{name}_%{version}.orig.tar.gz +Requires: curl +Requires: google-compute-engine-oslogin +Requires: python-google-compute-engine = %{version} +Requires: rsyslog + +BuildArch: noarch +BuildRequires: systemd + +# Allow other files in the source that don't end up in the package. +%define _unpackaged_files_terminate_build 0 + +%description +This package contains scripts, configuration, and init files for features +specific to the Google Compute Engine cloud environment. + +%prep +%autosetup + +%install +cp -a src/{etc,usr} %{buildroot} +install -d %{buildroot}/{%{_unitdir},%{_presetdir},%{_udevrulesdir}} +cp -a src/lib/systemd/system/* %{buildroot}/%{_unitdir} +cp -a src/lib/systemd/system-preset/* %{buildroot}/%{_presetdir} +cp -a src/lib/udev/rules.d/* %{buildroot}/%{_udevrulesdir} + +%files +%defattr(0644,root,root,0755) +%attr(0755,-,-) %{_bindir}/* +%attr(0755,-,-) /etc/dhcp/dhclient.d/google_hostname.sh +%{_udevrulesdir}/* +%{_unitdir}/* +%{_presetdir}/* +%config /etc/modprobe.d/* +%config /etc/rsyslog.d/* +%config /etc/sysctl.d/* + +%post +# On upgrade run instance setup again to handle any new configs and restart +# daemons. +if [ $1 -eq 2 ]; then + /usr/bin/google_instance_setup + systemctl reload-or-restart google-accounts-daemon.service + systemctl reload-or-restart google-clock-skew-daemon.service + systemctl reload-or-restart google-network-daemon.service +fi + +%systemd_post google-accounts-daemon.service +%systemd_post google-clock-skew-daemon.service +%systemd_post google-instance-setup.service +%systemd_post google-network-daemon.service +%systemd_post google-shutdown-scripts.service +%systemd_post google-startup-scripts.service + +# Remove old services. +if [ -f /lib/systemd/system/google-ip-forwarding-daemon.service ]; then + systemctl stop --no-block google-ip-forwarding-daemon + systemctl disable google-ip-forwarding-daemon.service +fi + +if [ -f /lib/systemd/system/google-network-setup.service ]; then + systemctl stop --no-block google-network-setup + systemctl disable google-network-setup.service +fi + +%preun +# On uninstall only. +if [ $1 -eq 0 ]; then + %systemd_preun google-accounts-daemon.service + %systemd_preun google-clock-skew-daemon.service + %systemd_preun google-instance-setup.service + %systemd_preun google-network-daemon.service + %systemd_preun google-shutdown-scripts.service + %systemd_preun google-startup-scripts.service +fi diff --git a/packages/google-compute-engine/packaging/setup_deb.sh b/packages/google-compute-engine/packaging/setup_deb.sh new file mode 100755 index 0000000..d8b1189 --- /dev/null +++ b/packages/google-compute-engine/packaging/setup_deb.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# Copyright 2018 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +NAME="google-compute-engine" +VERSION="2.8.12" + +working_dir=${PWD} +if [[ $(basename "$working_dir") != $NAME ]]; then + echo "Packaging scripts must be run from top of package dir." + exit 1 +fi + +# Build dependencies. +sudo apt-get -y install dh-systemd + +# .deb creation tools. +sudo apt-get -y install debhelper devscripts build-essential + +rm -rf /tmp/debpackage +mkdir /tmp/debpackage +cd src +tar czvf /tmp/debpackage/${NAME}_${VERSION}.orig.tar.gz --transform "s/^\./${NAME}-${VERSION}/" . + +cd /tmp/debpackage +tar xzvf ${NAME}_${VERSION}.orig.tar.gz + +cd ${NAME}-${VERSION} + +cp -r ${working_dir}/packaging/debian ./ + +debuild -us -uc diff --git a/packages/google-compute-engine/packaging/setup_rpm.sh b/packages/google-compute-engine/packaging/setup_rpm.sh new file mode 100755 index 0000000..79b0ccf --- /dev/null +++ b/packages/google-compute-engine/packaging/setup_rpm.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# Copyright 2018 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +NAME="google-compute-engine" +VERSION="2.8.12" + +rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION} +working_dir=${PWD} +if [[ $(basename "$working_dir") != $NAME ]]; then + echo "Packaging scripts must be run from top of package dir." + exit 1 +fi + +# Build dependencies. +sudo yum -y install make gcc-c++ libcurl-devel json-c json-c-devel pam-devel \ + policycoreutils-python boost-devel + +# RPM creation tools. +sudo yum -y install rpmdevtools + +rm -rf /tmp/rpmpackage +mkdir -p ${rpm_working_dir}/{SOURCES,SPECS} + +# EL6 has a separate .spec file. +if [[ -e /etc/redhat-release ]] && grep -q release\ 6 /etc/redhat-release; then + cp packaging/${NAME}-el6.spec ${rpm_working_dir}/SPECS/${NAME}.spec +else + cp packaging/${NAME}.spec ${rpm_working_dir}/SPECS/ +fi + +tar czvf ${rpm_working_dir}/SOURCES/${NAME}_${VERSION}.orig.tar.gz \ + --exclude .git --exclude packaging --transform "s/^\./${NAME}-${VERSION}/" . + +rpmbuild --define "_topdir ${rpm_working_dir}/" --define "_version ${VERSION}" \ + -ba ${rpm_working_dir}/SPECS/${NAME}.spec diff --git a/google_config/apt/01autoremove-gce b/packages/google-compute-engine/src/etc/apt/apt.conf.d/01autoremove-gce index be2d7f5..be2d7f5 100644 --- a/google_config/apt/01autoremove-gce +++ b/packages/google-compute-engine/src/etc/apt/apt.conf.d/01autoremove-gce diff --git a/google_config/apt/99ipv4-only b/packages/google-compute-engine/src/etc/apt/apt.conf.d/99ipv4-only index efca3b6..efca3b6 100644 --- a/google_config/apt/99ipv4-only +++ b/packages/google-compute-engine/src/etc/apt/apt.conf.d/99ipv4-only diff --git a/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks b/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks new file mode 120000 index 0000000..577ef53 --- /dev/null +++ b/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks @@ -0,0 +1 @@ +/usr/bin/google_set_hostname
\ No newline at end of file diff --git a/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks.d/google_set_hostname b/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks.d/google_set_hostname new file mode 120000 index 0000000..577ef53 --- /dev/null +++ b/packages/google-compute-engine/src/etc/dhcp/dhclient-exit-hooks.d/google_set_hostname @@ -0,0 +1 @@ +/usr/bin/google_set_hostname
\ No newline at end of file diff --git a/google_config/dhcp/google_hostname.sh b/packages/google-compute-engine/src/etc/dhcp/dhclient.d/google_hostname.sh index abe8ce2..abe8ce2 100755 --- a/google_config/dhcp/google_hostname.sh +++ b/packages/google-compute-engine/src/etc/dhcp/dhclient.d/google_hostname.sh diff --git a/google_compute_engine_init/upstart/google-accounts-daemon.conf b/packages/google-compute-engine/src/etc/init/google-accounts-daemon.conf index 446b92c..446b92c 100644 --- a/google_compute_engine_init/upstart/google-accounts-daemon.conf +++ b/packages/google-compute-engine/src/etc/init/google-accounts-daemon.conf diff --git a/google_compute_engine_init/upstart/google-clock-skew-daemon.conf b/packages/google-compute-engine/src/etc/init/google-clock-skew-daemon.conf index 05c73ce..05c73ce 100644 --- a/google_compute_engine_init/upstart/google-clock-skew-daemon.conf +++ b/packages/google-compute-engine/src/etc/init/google-clock-skew-daemon.conf diff --git a/google_compute_engine_init/upstart/google-instance-setup.conf b/packages/google-compute-engine/src/etc/init/google-instance-setup.conf index 2c7d596..2c7d596 100644 --- a/google_compute_engine_init/upstart/google-instance-setup.conf +++ b/packages/google-compute-engine/src/etc/init/google-instance-setup.conf diff --git a/google_compute_engine_init/upstart/google-network-daemon.conf b/packages/google-compute-engine/src/etc/init/google-network-daemon.conf index d2e985a..d2e985a 100644 --- a/google_compute_engine_init/upstart/google-network-daemon.conf +++ b/packages/google-compute-engine/src/etc/init/google-network-daemon.conf diff --git a/google_compute_engine_init/upstart/google-shutdown-scripts.conf b/packages/google-compute-engine/src/etc/init/google-shutdown-scripts.conf index b9323a5..b9323a5 100644 --- a/google_compute_engine_init/upstart/google-shutdown-scripts.conf +++ b/packages/google-compute-engine/src/etc/init/google-shutdown-scripts.conf diff --git a/google_compute_engine_init/upstart/google-startup-scripts.conf b/packages/google-compute-engine/src/etc/init/google-startup-scripts.conf index 3bda504..3bda504 100644 --- a/google_compute_engine_init/upstart/google-startup-scripts.conf +++ b/packages/google-compute-engine/src/etc/init/google-startup-scripts.conf diff --git a/google_config/modprobe/gce-blacklist.conf b/packages/google-compute-engine/src/etc/modprobe.d/gce-blacklist.conf index 9b7700e..9b7700e 100644 --- a/google_config/modprobe/gce-blacklist.conf +++ b/packages/google-compute-engine/src/etc/modprobe.d/gce-blacklist.conf diff --git a/google_config/rsyslog/90-google.conf b/packages/google-compute-engine/src/etc/rsyslog.d/90-google.conf index 81b2ed7..81b2ed7 100644 --- a/google_config/rsyslog/90-google.conf +++ b/packages/google-compute-engine/src/etc/rsyslog.d/90-google.conf diff --git a/google_config/sysctl/11-gce-network-security.conf b/packages/google-compute-engine/src/etc/sysctl.d/11-gce-network-security.conf index 0e4db8c..0e4db8c 100644 --- a/google_config/sysctl/11-gce-network-security.conf +++ b/packages/google-compute-engine/src/etc/sysctl.d/11-gce-network-security.conf diff --git a/google_compute_engine_init/systemd/90-google-compute-engine.preset b/packages/google-compute-engine/src/lib/systemd/system-preset/90-google-compute-engine.preset index b903cb7..b903cb7 100644 --- a/google_compute_engine_init/systemd/90-google-compute-engine.preset +++ b/packages/google-compute-engine/src/lib/systemd/system-preset/90-google-compute-engine.preset diff --git a/google_compute_engine_init/systemd/google-accounts-daemon.service b/packages/google-compute-engine/src/lib/systemd/system/google-accounts-daemon.service index f1d7111..f1d7111 100644 --- a/google_compute_engine_init/systemd/google-accounts-daemon.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-accounts-daemon.service diff --git a/google_compute_engine_init/systemd/google-clock-skew-daemon.service b/packages/google-compute-engine/src/lib/systemd/system/google-clock-skew-daemon.service index 71369f5..71369f5 100644 --- a/google_compute_engine_init/systemd/google-clock-skew-daemon.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-clock-skew-daemon.service diff --git a/google_compute_engine_init/systemd/google-instance-setup.service b/packages/google-compute-engine/src/lib/systemd/system/google-instance-setup.service index afa639a..afa639a 100644 --- a/google_compute_engine_init/systemd/google-instance-setup.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-instance-setup.service diff --git a/google_compute_engine_init/systemd/google-network-daemon.service b/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service index 74bf82e..74bf82e 100644 --- a/google_compute_engine_init/systemd/google-network-daemon.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service diff --git a/google_compute_engine_init/systemd/google-shutdown-scripts.service b/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service index 069405e..069405e 100644 --- a/google_compute_engine_init/systemd/google-shutdown-scripts.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service diff --git a/google_compute_engine_init/systemd/google-startup-scripts.service b/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service index 73ee8db..73ee8db 100644 --- a/google_compute_engine_init/systemd/google-startup-scripts.service +++ b/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service diff --git a/google_config/udev/64-gce-disk-removal.rules b/packages/google-compute-engine/src/lib/udev/rules.d/64-gce-disk-removal.rules index 4ff1f99..4ff1f99 100644 --- a/google_config/udev/64-gce-disk-removal.rules +++ b/packages/google-compute-engine/src/lib/udev/rules.d/64-gce-disk-removal.rules diff --git a/google_config/udev/65-gce-disk-naming.rules b/packages/google-compute-engine/src/lib/udev/rules.d/65-gce-disk-naming.rules index e258548..e258548 100644 --- a/google_config/udev/65-gce-disk-naming.rules +++ b/packages/google-compute-engine/src/lib/udev/rules.d/65-gce-disk-naming.rules diff --git a/scripts/google_optimize_local_ssd b/packages/google-compute-engine/src/usr/bin/google_optimize_local_ssd index 15238b9..15238b9 100755 --- a/scripts/google_optimize_local_ssd +++ b/packages/google-compute-engine/src/usr/bin/google_optimize_local_ssd diff --git a/google_config/bin/google_set_hostname b/packages/google-compute-engine/src/usr/bin/google_set_hostname index 883844b..883844b 100755 --- a/google_config/bin/google_set_hostname +++ b/packages/google-compute-engine/src/usr/bin/google_set_hostname diff --git a/scripts/google_set_multiqueue b/packages/google-compute-engine/src/usr/bin/google_set_multiqueue index 9dfe45f..9dfe45f 100755 --- a/scripts/google_set_multiqueue +++ b/packages/google-compute-engine/src/usr/bin/google_set_multiqueue diff --git a/google_config/journald/20-google.conf b/packages/google-compute-engine/src/usr/lib/systemd/journald.conf.d/20-google.conf index b3439bb..6c620d5 100644 --- a/google_config/journald/20-google.conf +++ b/packages/google-compute-engine/src/usr/lib/systemd/journald.conf.d/20-google.conf @@ -1,4 +1,5 @@ # Google Compute Engine default console logging. +# This is not currently included in any packages, but may in the future. [Journal] ForwardToConsole=yes diff --git a/google_config/sbin/google-dhclient-script b/packages/google-compute-engine/src/usr/sbin/google-dhclient-script index 2f5b5e7..2f5b5e7 100755 --- a/google_config/sbin/google-dhclient-script +++ b/packages/google-compute-engine/src/usr/sbin/google-dhclient-script diff --git a/.coveragerc b/packages/python-google-compute-engine/.coveragerc index b96b3fc..b96b3fc 100644 --- a/.coveragerc +++ b/packages/python-google-compute-engine/.coveragerc diff --git a/LICENSE b/packages/python-google-compute-engine/LICENSE index 04cb0d7..04cb0d7 100644 --- a/LICENSE +++ b/packages/python-google-compute-engine/LICENSE diff --git a/MANIFEST.in b/packages/python-google-compute-engine/MANIFEST.in index 040f2fa..040f2fa 100644 --- a/MANIFEST.in +++ b/packages/python-google-compute-engine/MANIFEST.in diff --git a/google_compute_engine/__init__.py b/packages/python-google-compute-engine/google_compute_engine/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/__init__.py diff --git a/google_compute_engine/accounts/__init__.py b/packages/python-google-compute-engine/google_compute_engine/accounts/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/accounts/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/accounts/__init__.py diff --git a/google_compute_engine/accounts/accounts_daemon.py b/packages/python-google-compute-engine/google_compute_engine/accounts/accounts_daemon.py index ecc47d3..ecc47d3 100755 --- a/google_compute_engine/accounts/accounts_daemon.py +++ b/packages/python-google-compute-engine/google_compute_engine/accounts/accounts_daemon.py diff --git a/google_compute_engine/accounts/accounts_utils.py b/packages/python-google-compute-engine/google_compute_engine/accounts/accounts_utils.py index 56732c5..56732c5 100644 --- a/google_compute_engine/accounts/accounts_utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/accounts/accounts_utils.py diff --git a/google_compute_engine/accounts/oslogin_utils.py b/packages/python-google-compute-engine/google_compute_engine/accounts/oslogin_utils.py index b5b4d8d..b5b4d8d 100644 --- a/google_compute_engine/accounts/oslogin_utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/accounts/oslogin_utils.py diff --git a/google_compute_engine/accounts/tests/accounts_daemon_test.py b/packages/python-google-compute-engine/google_compute_engine/accounts/tests/accounts_daemon_test.py index 82fb948..82fb948 100644 --- a/google_compute_engine/accounts/tests/accounts_daemon_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/accounts/tests/accounts_daemon_test.py diff --git a/google_compute_engine/accounts/tests/accounts_utils_test.py b/packages/python-google-compute-engine/google_compute_engine/accounts/tests/accounts_utils_test.py index fb51dc4..fb51dc4 100644 --- a/google_compute_engine/accounts/tests/accounts_utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/accounts/tests/accounts_utils_test.py diff --git a/google_compute_engine/accounts/tests/oslogin_utils_test.py b/packages/python-google-compute-engine/google_compute_engine/accounts/tests/oslogin_utils_test.py index 5e0aec8..5e0aec8 100644 --- a/google_compute_engine/accounts/tests/oslogin_utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/accounts/tests/oslogin_utils_test.py diff --git a/google_compute_engine/boto/__init__.py b/packages/python-google-compute-engine/google_compute_engine/boto/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/boto/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/boto/__init__.py diff --git a/google_compute_engine/boto/boto_config.py b/packages/python-google-compute-engine/google_compute_engine/boto/boto_config.py index 6771c5c..6771c5c 100644 --- a/google_compute_engine/boto/boto_config.py +++ b/packages/python-google-compute-engine/google_compute_engine/boto/boto_config.py diff --git a/google_compute_engine/boto/compute_auth.py b/packages/python-google-compute-engine/google_compute_engine/boto/compute_auth.py index d46e54b..d46e54b 100644 --- a/google_compute_engine/boto/compute_auth.py +++ b/packages/python-google-compute-engine/google_compute_engine/boto/compute_auth.py diff --git a/google_compute_engine/boto/tests/boto_config_test.py b/packages/python-google-compute-engine/google_compute_engine/boto/tests/boto_config_test.py index 3ba4168..3ba4168 100644 --- a/google_compute_engine/boto/tests/boto_config_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/boto/tests/boto_config_test.py diff --git a/google_compute_engine/boto/tests/compute_auth_test.py b/packages/python-google-compute-engine/google_compute_engine/boto/tests/compute_auth_test.py index 0c31052..0c31052 100644 --- a/google_compute_engine/boto/tests/compute_auth_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/boto/tests/compute_auth_test.py diff --git a/google_compute_engine/clock_skew/__init__.py b/packages/python-google-compute-engine/google_compute_engine/clock_skew/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/clock_skew/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/clock_skew/__init__.py diff --git a/google_compute_engine/clock_skew/clock_skew_daemon.py b/packages/python-google-compute-engine/google_compute_engine/clock_skew/clock_skew_daemon.py index 3ae5978..3ae5978 100755 --- a/google_compute_engine/clock_skew/clock_skew_daemon.py +++ b/packages/python-google-compute-engine/google_compute_engine/clock_skew/clock_skew_daemon.py diff --git a/google_compute_engine/clock_skew/tests/clock_skew_daemon_test.py b/packages/python-google-compute-engine/google_compute_engine/clock_skew/tests/clock_skew_daemon_test.py index db1596c..db1596c 100644 --- a/google_compute_engine/clock_skew/tests/clock_skew_daemon_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/clock_skew/tests/clock_skew_daemon_test.py diff --git a/google_compute_engine/compat.py b/packages/python-google-compute-engine/google_compute_engine/compat.py index 53dab99..53dab99 100644 --- a/google_compute_engine/compat.py +++ b/packages/python-google-compute-engine/google_compute_engine/compat.py diff --git a/google_compute_engine/config_manager.py b/packages/python-google-compute-engine/google_compute_engine/config_manager.py index 1057bf1..1057bf1 100644 --- a/google_compute_engine/config_manager.py +++ b/packages/python-google-compute-engine/google_compute_engine/config_manager.py diff --git a/google_compute_engine/constants.py b/packages/python-google-compute-engine/google_compute_engine/constants.py index d908275..d908275 100644 --- a/google_compute_engine/constants.py +++ b/packages/python-google-compute-engine/google_compute_engine/constants.py diff --git a/google_compute_engine/distro_lib/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/__init__.py diff --git a/google_compute_engine/distro_lib/debian_8/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_8/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/debian_8/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_8/__init__.py diff --git a/google_compute_engine/distro_lib/debian_8/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_8/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/debian_8/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_8/tests/__init__.py diff --git a/google_compute_engine/distro_lib/debian_8/tests/utils_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_8/tests/utils_test.py index 6ff9f9c..6ff9f9c 100644 --- a/google_compute_engine/distro_lib/debian_8/tests/utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_8/tests/utils_test.py diff --git a/google_compute_engine/distro_lib/debian_8/utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_8/utils.py index 9bdccb8..9bdccb8 100644 --- a/google_compute_engine/distro_lib/debian_8/utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_8/utils.py diff --git a/google_compute_engine/distro_lib/debian_9/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_9/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/debian_9/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_9/__init__.py diff --git a/google_compute_engine/distro_lib/debian_9/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_9/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/debian_9/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_9/tests/__init__.py diff --git a/google_compute_engine/distro_lib/debian_9/tests/utils_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_9/tests/utils_test.py index 2717f00..2717f00 100644 --- a/google_compute_engine/distro_lib/debian_9/tests/utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_9/tests/utils_test.py diff --git a/google_compute_engine/distro_lib/debian_9/utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_9/utils.py index 452e02f..452e02f 100644 --- a/google_compute_engine/distro_lib/debian_9/utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/debian_9/utils.py diff --git a/google_compute_engine/distro_lib/el_6/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_6/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/el_6/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_6/__init__.py diff --git a/google_compute_engine/distro_lib/el_6/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_6/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/el_6/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_6/tests/__init__.py diff --git a/google_compute_engine/distro_lib/el_6/tests/utils_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_6/tests/utils_test.py index 539b059..539b059 100644 --- a/google_compute_engine/distro_lib/el_6/tests/utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_6/tests/utils_test.py diff --git a/google_compute_engine/distro_lib/el_6/utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_6/utils.py index 20b8e2f..20b8e2f 100644 --- a/google_compute_engine/distro_lib/el_6/utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_6/utils.py diff --git a/google_compute_engine/distro_lib/el_7/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_7/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/el_7/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_7/__init__.py diff --git a/google_compute_engine/distro_lib/el_7/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_7/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/el_7/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_7/tests/__init__.py diff --git a/google_compute_engine/distro_lib/el_7/tests/utils_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_7/tests/utils_test.py index d726c3d..d726c3d 100644 --- a/google_compute_engine/distro_lib/el_7/tests/utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_7/tests/utils_test.py diff --git a/google_compute_engine/distro_lib/el_7/utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_7/utils.py index b11a98f..b11a98f 100644 --- a/google_compute_engine/distro_lib/el_7/utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/el_7/utils.py diff --git a/google_compute_engine/distro_lib/freebsd_11/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/freebsd_11/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/freebsd_11/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/freebsd_11/__init__.py diff --git a/google_compute_engine/distro_lib/freebsd_11/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/freebsd_11/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/freebsd_11/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/freebsd_11/tests/__init__.py diff --git a/google_compute_engine/distro_lib/freebsd_11/tests/utils_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/freebsd_11/tests/utils_test.py index ead9fa4..ead9fa4 100644 --- a/google_compute_engine/distro_lib/freebsd_11/tests/utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/freebsd_11/tests/utils_test.py diff --git a/google_compute_engine/distro_lib/freebsd_11/utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/freebsd_11/utils.py index 4a9e706..4a9e706 100644 --- a/google_compute_engine/distro_lib/freebsd_11/utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/freebsd_11/utils.py diff --git a/google_compute_engine/distro_lib/helpers.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/helpers.py index 93902b3..93902b3 100644 --- a/google_compute_engine/distro_lib/helpers.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/helpers.py diff --git a/google_compute_engine/distro_lib/ip_forwarding_utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/ip_forwarding_utils.py index 63532e2..63532e2 100644 --- a/google_compute_engine/distro_lib/ip_forwarding_utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/ip_forwarding_utils.py diff --git a/google_compute_engine/distro_lib/sles_11/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_11/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/sles_11/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_11/__init__.py diff --git a/google_compute_engine/distro_lib/sles_11/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_11/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/sles_11/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_11/tests/__init__.py diff --git a/google_compute_engine/distro_lib/sles_11/tests/utils_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_11/tests/utils_test.py index 22d54de..22d54de 100644 --- a/google_compute_engine/distro_lib/sles_11/tests/utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_11/tests/utils_test.py diff --git a/google_compute_engine/distro_lib/sles_11/utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_11/utils.py index 6d1d0f2..6d1d0f2 100644 --- a/google_compute_engine/distro_lib/sles_11/utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_11/utils.py diff --git a/google_compute_engine/distro_lib/sles_12/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/sles_12/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/__init__.py diff --git a/google_compute_engine/distro_lib/sles_12/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/distro_lib/sles_12/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/tests/__init__.py diff --git a/google_compute_engine/distro_lib/sles_12/tests/utils_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/tests/utils_test.py index 1f89c2e..1f89c2e 100644 --- a/google_compute_engine/distro_lib/sles_12/tests/utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/tests/utils_test.py diff --git a/google_compute_engine/distro_lib/sles_12/utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/utils.py index 380df7b..380df7b 100644 --- a/google_compute_engine/distro_lib/sles_12/utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/utils.py diff --git a/google_compute_engine/distro_lib/tests/helpers_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/tests/helpers_test.py index 7533b20..7533b20 100644 --- a/google_compute_engine/distro_lib/tests/helpers_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/tests/helpers_test.py diff --git a/google_compute_engine/distro_lib/tests/ip_forwarding_utils_test.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/tests/ip_forwarding_utils_test.py index e3f4bbc..e3f4bbc 100644 --- a/google_compute_engine/distro_lib/tests/ip_forwarding_utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/tests/ip_forwarding_utils_test.py diff --git a/google_compute_engine/distro_lib/utils.py b/packages/python-google-compute-engine/google_compute_engine/distro_lib/utils.py index 75b656e..75b656e 100644 --- a/google_compute_engine/distro_lib/utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/distro_lib/utils.py diff --git a/google_compute_engine/file_utils.py b/packages/python-google-compute-engine/google_compute_engine/file_utils.py index ba6ebb2..ba6ebb2 100644 --- a/google_compute_engine/file_utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/file_utils.py diff --git a/google_compute_engine/instance_setup/__init__.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/instance_setup/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/__init__.py diff --git a/google_compute_engine/instance_setup/instance_config.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_config.py index 1c23171..1c23171 100644 --- a/google_compute_engine/instance_setup/instance_config.py +++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_config.py diff --git a/google_compute_engine/instance_setup/instance_setup.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py index 80785e9..80785e9 100755 --- a/google_compute_engine/instance_setup/instance_setup.py +++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py diff --git a/google_compute_engine/instance_setup/tests/instance_config_test.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_config_test.py index eb91adb..eb91adb 100644 --- a/google_compute_engine/instance_setup/tests/instance_config_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_config_test.py diff --git a/google_compute_engine/instance_setup/tests/instance_setup_test.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py index 97a4674..97a4674 100644 --- a/google_compute_engine/instance_setup/tests/instance_setup_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py diff --git a/google_compute_engine/logger.py b/packages/python-google-compute-engine/google_compute_engine/logger.py index a075eae..a075eae 100644 --- a/google_compute_engine/logger.py +++ b/packages/python-google-compute-engine/google_compute_engine/logger.py diff --git a/google_compute_engine/metadata_scripts/__init__.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/metadata_scripts/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/__init__.py diff --git a/google_compute_engine/metadata_scripts/script_executor.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_executor.py index 3523f72..3523f72 100644 --- a/google_compute_engine/metadata_scripts/script_executor.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_executor.py diff --git a/google_compute_engine/metadata_scripts/script_manager.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_manager.py index 32c1452..32c1452 100755 --- a/google_compute_engine/metadata_scripts/script_manager.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_manager.py diff --git a/google_compute_engine/metadata_scripts/script_retriever.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py index 4c531e5..4c531e5 100644 --- a/google_compute_engine/metadata_scripts/script_retriever.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py diff --git a/google_compute_engine/metadata_scripts/tests/script_executor_test.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_executor_test.py index 84c66d4..84c66d4 100644 --- a/google_compute_engine/metadata_scripts/tests/script_executor_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_executor_test.py diff --git a/google_compute_engine/metadata_scripts/tests/script_manager_test.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_manager_test.py index f932a92..f932a92 100644 --- a/google_compute_engine/metadata_scripts/tests/script_manager_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_manager_test.py diff --git a/google_compute_engine/metadata_scripts/tests/script_retriever_test.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py index de7179e..de7179e 100644 --- a/google_compute_engine/metadata_scripts/tests/script_retriever_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py diff --git a/google_compute_engine/metadata_watcher.py b/packages/python-google-compute-engine/google_compute_engine/metadata_watcher.py index 72a12f9..72a12f9 100644 --- a/google_compute_engine/metadata_watcher.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_watcher.py diff --git a/google_compute_engine/network_utils.py b/packages/python-google-compute-engine/google_compute_engine/network_utils.py index 4012e52..4012e52 100644 --- a/google_compute_engine/network_utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/network_utils.py diff --git a/google_compute_engine/networking/__init__.py b/packages/python-google-compute-engine/google_compute_engine/networking/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/networking/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/__init__.py diff --git a/google_compute_engine/networking/ip_forwarding/__init__.py b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/networking/ip_forwarding/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/__init__.py diff --git a/google_compute_engine/networking/ip_forwarding/ip_forwarding.py b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/ip_forwarding.py index 6a16956..6a16956 100755 --- a/google_compute_engine/networking/ip_forwarding/ip_forwarding.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/ip_forwarding.py diff --git a/google_compute_engine/networking/ip_forwarding/ip_forwarding_utils.py b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/ip_forwarding_utils.py index 1f0564e..1f0564e 100644 --- a/google_compute_engine/networking/ip_forwarding/ip_forwarding_utils.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/ip_forwarding_utils.py diff --git a/google_compute_engine/networking/ip_forwarding/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/networking/ip_forwarding/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/tests/__init__.py diff --git a/google_compute_engine/networking/ip_forwarding/tests/ip_forwarding_test.py b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/tests/ip_forwarding_test.py index 986b20a..986b20a 100644 --- a/google_compute_engine/networking/ip_forwarding/tests/ip_forwarding_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/ip_forwarding/tests/ip_forwarding_test.py diff --git a/google_compute_engine/networking/network_daemon.py b/packages/python-google-compute-engine/google_compute_engine/networking/network_daemon.py index 95b190b..95b190b 100644 --- a/google_compute_engine/networking/network_daemon.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/network_daemon.py diff --git a/google_compute_engine/networking/network_setup/__init__.py b/packages/python-google-compute-engine/google_compute_engine/networking/network_setup/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/networking/network_setup/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/network_setup/__init__.py diff --git a/google_compute_engine/networking/network_setup/network_setup.py b/packages/python-google-compute-engine/google_compute_engine/networking/network_setup/network_setup.py index 9166722..9166722 100755 --- a/google_compute_engine/networking/network_setup/network_setup.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/network_setup/network_setup.py diff --git a/google_compute_engine/networking/network_setup/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/networking/network_setup/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/networking/network_setup/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/network_setup/tests/__init__.py diff --git a/google_compute_engine/networking/network_setup/tests/network_setup_test.py b/packages/python-google-compute-engine/google_compute_engine/networking/network_setup/tests/network_setup_test.py index 644510a..644510a 100644 --- a/google_compute_engine/networking/network_setup/tests/network_setup_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/network_setup/tests/network_setup_test.py diff --git a/google_compute_engine/networking/tests/__init__.py b/packages/python-google-compute-engine/google_compute_engine/networking/tests/__init__.py index e69de29..e69de29 100644 --- a/google_compute_engine/networking/tests/__init__.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/tests/__init__.py diff --git a/google_compute_engine/networking/tests/network_daemon_test.py b/packages/python-google-compute-engine/google_compute_engine/networking/tests/network_daemon_test.py index acf0371..acf0371 100644 --- a/google_compute_engine/networking/tests/network_daemon_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/networking/tests/network_daemon_test.py diff --git a/google_compute_engine/test_compat.py b/packages/python-google-compute-engine/google_compute_engine/test_compat.py index 71fb12a..71fb12a 100644 --- a/google_compute_engine/test_compat.py +++ b/packages/python-google-compute-engine/google_compute_engine/test_compat.py diff --git a/google_compute_engine/tests/compat_test.py b/packages/python-google-compute-engine/google_compute_engine/tests/compat_test.py index ec28323..ec28323 100644 --- a/google_compute_engine/tests/compat_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/tests/compat_test.py diff --git a/google_compute_engine/tests/config_manager_test.py b/packages/python-google-compute-engine/google_compute_engine/tests/config_manager_test.py index 185989a..185989a 100644 --- a/google_compute_engine/tests/config_manager_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/tests/config_manager_test.py diff --git a/google_compute_engine/tests/file_utils_test.py b/packages/python-google-compute-engine/google_compute_engine/tests/file_utils_test.py index 1b170a3..1b170a3 100644 --- a/google_compute_engine/tests/file_utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/tests/file_utils_test.py diff --git a/google_compute_engine/tests/logger_test.py b/packages/python-google-compute-engine/google_compute_engine/tests/logger_test.py index a0b6100..a0b6100 100644 --- a/google_compute_engine/tests/logger_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/tests/logger_test.py diff --git a/google_compute_engine/tests/metadata_watcher_test.py b/packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py index 1bce509..1bce509 100644 --- a/google_compute_engine/tests/metadata_watcher_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/tests/metadata_watcher_test.py diff --git a/google_compute_engine/tests/network_utils_test.py b/packages/python-google-compute-engine/google_compute_engine/tests/network_utils_test.py index 5660f7f..5660f7f 100644 --- a/google_compute_engine/tests/network_utils_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/tests/network_utils_test.py diff --git a/packages/python-google-compute-engine/packaging/debian/changelog b/packages/python-google-compute-engine/packaging/debian/changelog new file mode 100644 index 0000000..b6befde --- /dev/null +++ b/packages/python-google-compute-engine/packaging/debian/changelog @@ -0,0 +1,189 @@ +python-google-compute-engine (2.8.12-1) stable; urgency=low + + * Fix two factor enablement on change. + + -- Google Cloud Team <gc-team@google.com> Wed, 05 Dec 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.11-1) stable; urgency=low + + * Split up the gpasswd command into two commands. + * Update two factor enablement on change. + + -- Google Cloud Team <gc-team@google.com> Tue, 04 Dec 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.10-1) stable; urgency=low + + * Fix the gpasswd command default. + + -- Google Cloud Team <gc-team@google.com> Fri, 30 Nov 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.9-1) stable; urgency=low + + * Support enabling OS Login two factor authentication. + * Improve accounts support for FreeBSD. + * Improve SELinux support. + + -- Google Cloud Team <gc-team@google.com> Wed, 28 Nov 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.8-1) stable; urgency=low + + * Update sudoer group membership without overriding local groups. + + -- Google Cloud Team <gc-team@google.com> Tue, 23 Oct 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.7-1) stable; urgency=low + + * Remove users from sudoers group on removal (fixed). + + -- Google Cloud Team <gc-team@google.com> Thu, 18 Oct 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.6-1) stable; urgency=low + + * Revert PR: Remove users from sudoers group on removal. + + -- Google Cloud Team <gc-team@google.com> Thu, 11 Oct 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.5-1) stable; urgency=low + + * Remove users from sudoers group on removal. + * Remove gsutil dependency for metadata scripts. + + -- Google Cloud Team <gc-team@google.com> Thu, 05 Oct 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.4-1) stable; urgency=low + + * Remove ntp dependency. + * Support Debian 10 Buster. + * Restart the network daemon if networking is restarted. + * Prevent setup of the default ethernet interface. + * Accounts daemon can now verify username is 32 characters or less. + + -- Google Cloud Team <gc-team@google.com> Wed, 05 Sep 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.3-1) stable; urgency=low + + * Prevent IP forwarding daemon log spam. + * Make default shell configurable when executing metadata scripts. + * Rename distro directory to distro_lib. + + -- Google Cloud Team <gc-team@google.com> Mon, 11 June 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.2-1) stable; urgency=low + + * Prevent delay in configuring IP forwarding routes. + * Improve instance setup support for FreeBSD. + + -- Google Cloud Team <gc-team@google.com> Thu, 10 May 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.1-1) stable; urgency=low + + * Improve OS Login disablement. + + -- Google Cloud Team <gc-team@google.com> Fri, 04 May 2018 12:00:00 -0700 + +google-compute-image-packages (2.8.0-1) stable; urgency=low + + * Create a new network daemon. + * Refactor the IP forwarding daemon and network setup. + * Improvements for using NSS cache in the accounts daemon. + + -- Google Cloud Team <gc-team@google.com> Tue, 01 May 2018 12:00:00 -0700 + +google-compute-image-packages (2.7.7-1) stable; urgency=low + + * Add support for NSS cache in OS Login. + + -- Google Cloud Team <gc-team@google.com> Thu, 08 Mar 2018 12:00:00 -0700 + +google-compute-image-packages (2.7.6-1) stable; urgency=low + + * Add distro specific logic. + + -- Google Cloud Team <gc-team@google.com> Wed, 21 Feb 2018 12:00:00 -0700 + +google-compute-image-packages (2.7.5-2) stable; urgency=low + + * Fix dependencies for syslog. + + -- Google Cloud Team <gc-team@google.com> Tue, 06 Feb 2018 12:00:00 -0700 + +google-compute-image-packages (2.7.5-1) stable; urgency=low + + * Revert hostname setting change in Debian. + + -- Google Cloud Team <gc-team@google.com> Mon, 29 Jan 2018 12:00:00 -0700 + +google-compute-image-packages (2.7.4-1) stable; urgency=low + + * Fix hostname setting in Debian. + + -- Google Cloud Team <gc-team@google.com> Mon, 29 Jan 2018 12:00:00 -0700 + +google-compute-image-packages (2.7.3-1) stable; urgency=low + + * Improve hostname setting and correctly restart rsyslog. + + -- Google Cloud Team <gc-team@google.com> Thu, 25 Jan 2018 12:00:00 -0700 + +google-compute-image-packages (2.7.2-2) stable; urgency=low + + * Force IPv4 for apt. + + -- Google Cloud Team <gc-team@google.com> Wed, 13 Dec 2017 12:00:00 -0700 + +google-compute-image-packages (2.7.2-1) stable; urgency=low + + * Generate SSH host keys when none are present. + * Improve logging when activating OS Login. + + -- Google Cloud Team <gc-team@google.com> Wed, 29 Nov 2017 12:00:00 -0700 + +google-compute-image-packages (2.7.1-1) stable; urgency=low + + * Update set_hostname file name to prevent conflict. + * Add apt config to prevent auto-removal of google-compute-engine. + + -- Google Cloud Team <gc-team@google.com> Wed, 25 Oct 2017 12:00:00 -0700 + +google-compute-image-packages (2.7.0-6) stable; urgency=low + + * Linux guest environment support for OS Login. + + -- Google Cloud Team <gc-team@google.com> Tue, 17 Oct 2017 12:00:00 -0700 + +google-compute-image-packages (2.6.2-1) stable; urgency=low + + * Fix system hang during VM shutdown. + + -- Google Cloud Team <gc-team@google.com> Fri, 06 Oct 2017 12:00:00 -0700 + +google-compute-image-packages (2.6.1-1) stable; urgency=low + + * Use curl to download metadata script files for SSL certificate validation. + * Use netifaces for retrieving MAC address names if the import exists. + + -- Google Cloud Team <gc-team@google.com> Thurs, 14 Sep 2017 12:00:00 -0700 + +google-compute-image-packages (2.6.0-4) stable; urgency=low + + * Fix DHCP exit hook install. + + -- Google Cloud Team <gc-team@google.com> Mon, 28 Aug 2017 12:00:00 -0700 + +google-compute-image-packages (2.6.0-3) stable; urgency=low + + * Add systemd preset. + + -- Google Cloud Team <gc-team@google.com> Fri, 25 Aug 2017 14:00:00 -0700 + +google-compute-image-packages (2.6.0-2) stable; urgency=low + + * Add DHCP exit hook script back into package. + + -- Google Cloud Team <gc-team@google.com> Fri, 25 Aug 2017 12:00:00 -0700 + +google-compute-image-packages (2.6.0-1) stable; urgency=low + + * New packaging. + + -- Google Cloud Team <gc-team@google.com> Mon, 27 Jun 2017 12:00:00 -0700 diff --git a/packages/python-google-compute-engine/packaging/debian/compat b/packages/python-google-compute-engine/packaging/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/packages/python-google-compute-engine/packaging/debian/compat @@ -0,0 +1 @@ +9 diff --git a/packages/python-google-compute-engine/packaging/debian/control b/packages/python-google-compute-engine/packaging/debian/control new file mode 100644 index 0000000..e54871a --- /dev/null +++ b/packages/python-google-compute-engine/packaging/debian/control @@ -0,0 +1,42 @@ +Source: python-google-compute-engine +Section: admin +Priority: optional +Maintainer: Google Cloud Team <gc-team@google.com> +Build-Depends: debhelper (>= 9), + dh-python, + python-all, + python-setuptools, + python3-all, + python3-setuptools, + python-pytest, + python3-pytest, + python-mock, + python-boto, + python3-boto, + python3-distro +Standards-Version: 3.9.8 +Homepage: https://github.com/GoogleCloudPlatform/compute-image-packages + +Package: python-google-compute-engine +Section: python +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Conflicts: google-compute-engine-jessie, + google-compute-engine-stretch, + google-compute-daemon, + google-startup-scripts +Description: Google Compute Engine python library for Python 2.x. + +Package: python3-google-compute-engine +Section: python +Architecture: all +Depends: ${misc:Depends}, + python3-distro | python3-distro-info, + python3-boto, + python3-pkg-resources, + python3:any +Conflicts: google-compute-engine-jessie, + google-compute-engine-stretch, + google-compute-daemon, + google-startup-scripts +Description: Google Compute Engine python library for Python 3.x. diff --git a/packages/python-google-compute-engine/packaging/debian/copyright b/packages/python-google-compute-engine/packaging/debian/copyright new file mode 100644 index 0000000..034c729 --- /dev/null +++ b/packages/python-google-compute-engine/packaging/debian/copyright @@ -0,0 +1,27 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: python-google-compute-engine +Upstream-Contact: gc-team@google.com + +Files: * +Copyright: Copyright 2017 Google Inc. +License: Apache-2.0 + +Files: debian/* +Copyright: Copyright 2017 Google Inc. +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". diff --git a/packages/python-google-compute-engine/packaging/debian/rules b/packages/python-google-compute-engine/packaging/debian/rules new file mode 100755 index 0000000..553f920 --- /dev/null +++ b/packages/python-google-compute-engine/packaging/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f + +export PYBUILD_NAME=google-compute-engine +export PYBUILD_TEST_PYTEST=1 +export PYBUILD_TEST_ARGS={dir}/google_compute_engine/ +export PYBUILD_SYSTEM=distutils + +%: + dh $@ --with python2,python3 --buildsystem=pybuild + +override_dh_clean: + rm -rf google_compute_engine.egg-info + dh_clean + +override_dh_auto_install: + dh_auto_install + mv debian/python3-google-compute-engine/usr/bin/google_instance_setup \ + debian/python3-google-compute-engine/usr/bin/google_instance_setup3 + mv debian/python3-google-compute-engine/usr/bin/google_accounts_daemon \ + debian/python3-google-compute-engine/usr/bin/google_accounts_daemon3 + mv debian/python3-google-compute-engine/usr/bin/google_network_daemon \ + debian/python3-google-compute-engine/usr/bin/google_network_daemon3 + mv debian/python3-google-compute-engine/usr/bin/google_clock_skew_daemon \ + debian/python3-google-compute-engine/usr/bin/google_clock_skew_daemon3 + mv debian/python3-google-compute-engine/usr/bin/google_metadata_script_runner \ + debian/python3-google-compute-engine/usr/bin/google_metadata_script_runner3 diff --git a/specs/python-google-compute-engine.spec b/packages/python-google-compute-engine/packaging/python-google-compute-engine.spec index 8d60452..f36bed3 100644 --- a/specs/python-google-compute-engine.spec +++ b/packages/python-google-compute-engine/packaging/python-google-compute-engine.spec @@ -18,12 +18,12 @@ %endif Name: python-google-compute-engine -Version: 2.8.12 +Version: %{_version} Release: 1%{?dist} Summary: Google Compute Engine python library License: ASL 2.0 Url: https://github.com/GoogleCloudPlatform/compute-image-packages -Source0: google-compute-engine_%{version}.orig.tar.gz +Source0: %{name}_%{version}.orig.tar.gz BuildArch: noarch BuildRequires: python2-devel python-setuptools python-boto @@ -41,14 +41,14 @@ Conflicts: google-startup-scripts Google Compute Engine python library for Python 2.x. %prep -%autosetup -n compute-image-packages +%autosetup %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root %{buildroot} -rm -Rf %{buildroot}/usr/bin %files %{python_sitelib}/* +%attr(0755,-,-) %{_bindir}/* diff --git a/packages/python-google-compute-engine/packaging/setup_deb.sh b/packages/python-google-compute-engine/packaging/setup_deb.sh new file mode 100755 index 0000000..d2bf00f --- /dev/null +++ b/packages/python-google-compute-engine/packaging/setup_deb.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# Copyright 2018 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +NAME="python-google-compute-engine" +VERSION="2.8.12" + +working_dir=${PWD} +if [[ $(basename "$working_dir") != $NAME ]]; then + echo "Packaging scripts must be run from top of package dir." + exit 1 +fi + +# Build dependencies. +sudo apt-get -y install python-all python-setuptools python3-all \ + python3-setuptools python-pytest python3-pytest python-mock + +# DEB creation tools. +sudo apt-get -y install debhelper devscripts build-essential + +rm -rf /tmp/debpackage +mkdir /tmp/debpackage +tar czvf /tmp/debpackage/${NAME}_${VERSION}.orig.tar.gz --exclude .git \ + --exclude packaging --transform "s/^\./${NAME}-${VERSION}/" . + +pushd /tmp/debpackage +tar xzvf ${NAME}_${VERSION}.orig.tar.gz + +cd ${NAME}-${VERSION} + +cp -r ${working_dir}/packaging/debian ./ + +debuild -us -uc diff --git a/packages/python-google-compute-engine/packaging/setup_rpm.sh b/packages/python-google-compute-engine/packaging/setup_rpm.sh new file mode 100755 index 0000000..46cf74b --- /dev/null +++ b/packages/python-google-compute-engine/packaging/setup_rpm.sh @@ -0,0 +1,41 @@ +#!/bin/bash +# Copyright 2018 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +NAME="python-google-compute-engine" +VERSION="2.8.12" + +rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION} +working_dir=${PWD} +if [[ $(basename "$working_dir") != $NAME ]]; then + echo "Packaging scripts must be run from top of package dir." + exit 1 +fi + +# Build dependencies. +sudo yum -y install python2-devel python-setuptools python-boto + +# RPM creation tools. +sudo yum -y install rpmdevtools + +rm -rf /tmp/rpmpackage +mkdir -p ${rpm_working_dir}/{SOURCES,SPECS} + +cp packaging/${NAME}.spec ${rpm_working_dir}/SPECS/ + +tar czvf ${rpm_working_dir}/SOURCES/${NAME}_${VERSION}.orig.tar.gz \ + --exclude .git --exclude packaging --transform "s/^\./${NAME}-${VERSION}/" . + +rpmbuild --define "_topdir ${rpm_working_dir}/" --define "_version ${VERSION}" \ + -ba ${rpm_working_dir}/SPECS/${NAME}.spec diff --git a/setup.cfg b/packages/python-google-compute-engine/setup.cfg index 3c6e79c..3c6e79c 100644 --- a/setup.cfg +++ b/packages/python-google-compute-engine/setup.cfg diff --git a/setup.py b/packages/python-google-compute-engine/setup.py index b00ec2c..8746f2f 100755 --- a/setup.py +++ b/packages/python-google-compute-engine/setup.py @@ -34,7 +34,6 @@ setuptools.setup( long_description='Google Compute Engine guest environment.', name='google-compute-engine', packages=setuptools.find_packages(), - scripts=glob.glob('scripts/*'), url='https://github.com/GoogleCloudPlatform/compute-image-packages', version='2.8.12', # Entry points create scripts in /usr/bin that call a function. diff --git a/tox.ini b/packages/python-google-compute-engine/tox.ini index 1e7c0b1..1e7c0b1 100644 --- a/tox.ini +++ b/packages/python-google-compute-engine/tox.ini diff --git a/specs/google-compute-engine.spec b/specs/google-compute-engine.spec deleted file mode 100644 index 8ea1370..0000000 --- a/specs/google-compute-engine.spec +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 2017 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Force the dist to be el7 to avoid el7.centos. -%if 0%{?rhel} == 7 - %define dist .el7 -%endif - -Name: google-compute-engine -Version: 2.8.12 -Release: 1%{?dist} -Summary: Google Compute Engine guest environment. -License: ASL 2.0 -Url: https://github.com/GoogleCloudPlatform/compute-image-packages -Source0: %{name}_%{version}.orig.tar.gz - -BuildArch: noarch -BuildRequires: python2-devel python-setuptools python-boto -%if 0%{?el7} -BuildRequires: systemd -%endif - -Requires: curl -Requires: google-compute-engine-oslogin -Requires: python-google-compute-engine = %{version} -Requires: python-setuptools -Requires: rsyslog -%if 0%{?el7} -Requires: systemd -%endif - -Obsoletes: google-compute-engine-init -Obsoletes: google-config -Obsoletes: google-startup-scripts -Conflicts: google-compute-engine-init -Conflicts: google-config -Conflicts: google-startup-scripts - -%description -This package contains scripts, configuration, and init files for features specific to the Google Compute Engine cloud environment. - -%prep -%autosetup -n compute-image-packages - -%install -mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}/etc/dhcp -mkdir -p %{buildroot}/etc/modprobe.d -mkdir -p %{buildroot}/etc/rsyslog.d -mkdir -p %{buildroot}/etc/sysctl.d -mkdir -p %{buildroot}/etc/udev/rules.d - -cp google_config/modprobe/gce-blacklist.conf %{buildroot}/etc/modprobe.d/ -cp google_config/rsyslog/90-google.conf %{buildroot}/etc/rsyslog.d/ -cp google_config/sysctl/11-gce-network-security.conf %{buildroot}/etc/sysctl.d/ -cp google_config/udev/*.rules %{buildroot}/etc/udev/rules.d/ - -# Install the python package to get the entry scripts. -python setup.py install --prefix=%{_prefix} --root %{buildroot} -rm -Rf %{buildroot}/usr/lib/python* - -%if 0%{?el6} -mkdir %{buildroot}/sbin -mkdir -p %{buildroot}/etc/init -cp google_compute_engine_init/upstart/*.conf %{buildroot}/etc/init/ -cp google_config/bin/google_set_hostname %{buildroot}/etc/dhcp/dhclient-exit-hooks -cp google_config/sbin/google-dhclient-script %{buildroot}/sbin/ -%endif - -%if 0%{?el7} -mkdir -p %{buildroot}/etc/dhcp/dhclient.d -mkdir -p %{buildroot}%{_unitdir} -mkdir -p %{buildroot}%{_presetdir} -cp google_compute_engine_init/systemd/*.service %{buildroot}%{_unitdir} -cp google_compute_engine_init/systemd/90-google-compute-engine.preset %{buildroot}%{_presetdir}/90-google-compute-engine.preset -cp google_config/bin/google_set_hostname %{buildroot}%{_bindir} -cp google_config/dhcp/google_hostname.sh %{buildroot}/etc/dhcp/dhclient.d/google_hostname.sh -%endif - - -%files -%defattr(0644,root,root,0755) -%if 0%{?el6} -%attr(0755,root,root) /sbin/google-dhclient-script -%attr(0755,root,root) /etc/dhcp/dhclient-exit-hooks -/etc/init/*.conf -%endif -%if 0%{?el7} -%attr(0755,root,root) /etc/dhcp/dhclient.d/google_hostname.sh -%{_unitdir}/*.service -%{_presetdir}/90-google-compute-engine.preset -%endif -%config /etc/modprobe.d/gce-blacklist.conf -%config /etc/rsyslog.d/90-google.conf -%config /etc/sysctl.d/11-gce-network-security.conf -/etc/udev/rules.d/*.rules -%attr(0755,root,root) %{_bindir}/* - -%post -%if 0%{?el6} -# On upgrade run instance setup again to handle any new configs and restart daemons. -if [ $1 -eq 2 ]; then - stop -q -n google-accounts-daemon - stop -q -n google-clock-skew-daemon - stop -q -n google-network-daemon - /usr/bin/google_instance_setup - start -q -n google-accounts-daemon - start -q -n google-clock-skew-daemon - start -q -n google-network-daemon -fi - -# Install google-compute-engine from pypi into the SCL environment if it exists. -# The google-compute-engine package in the SCL environment needs to be maintained -# along with the python 2.6 package from the RPM. In particular, SCL python2.7 -# packages that use boto will need the up to date package available in case of -# any changes in the shared libraries. -if [ -d /opt/rh/python27/root/usr/lib/python2.7/site-packages/google_compute_engine ]; then - scl enable python27 "pip2.7 install --upgrade google_compute_engine" -fi -%endif - -# Remove old services. -if [ -f /lib/systemd/system/google-ip-forwarding-daemon.service ]; then - systemctl stop --no-block google-ip-forwarding-daemon - systemctl disable google-ip-forwarding-daemon.service -fi - -if [ -f /lib/systemd/system/google-network-setup.service ]; then - systemctl stop --no-block google-network-setup - systemctl disable google-network-setup.service -fi - -# Stop old services in EL6. -%if 0%{?el6} - if initctl status google-ip-forwarding-daemon | grep -q 'running'; then - stop -q -n google-ip-forwarding-daemon - fi -%endif - -if [ $1 -eq 2 ]; then - # New service might not be enabled during upgrade. - systemctl enable google-network-daemon.service -fi - -%if 0%{?el7} -%systemd_post google-accounts-daemon.service -%systemd_post google-clock-skew-daemon.service -%systemd_post google-instance-setup.service -%systemd_post google-network-daemon.service -%systemd_post google-shutdown-scripts.service -%systemd_post google-startup-scripts.service -# On upgrade run instance setup again to handle any new configs and restart daemons. -if [ $1 -eq 2 ]; then - /usr/bin/google_instance_setup - systemctl reload-or-restart google-accounts-daemon.service - systemctl reload-or-restart google-clock-skew-daemon.service - systemctl reload-or-restart google-network-daemon.service -fi -%endif - - -%preun -# On uninstall only. -if [ $1 -eq 0 ]; then -%if 0%{?el6} - stop -q -n google-accounts-daemon - stop -q -n google-clock-skew-daemon - stop -q -n google-network-daemon - if initctl status google-ip-forwarding-daemon | grep -q 'running'; then - stop -q -n google-ip-forwarding-daemon - fi -%endif -%if 0%{?el7} - %systemd_preun google-accounts-daemon.service - %systemd_preun google-clock-skew-daemon.service - %systemd_preun google-instance-setup.service - %systemd_preun google-network-daemon.service - %systemd_preun google-shutdown-scripts.service - %systemd_preun google-startup-scripts.service -%endif -fi |