From 97c799785025583391ac043b4ccf963a2091603b Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 11 Aug 2013 13:55:43 -0400 Subject: [PATCH] fix(dev-db/etcd): Remove coreos-c10n, it is moving to coreos-init --- ...d-0.0.1-r5.ebuild => etcd-0.0.1-r6.ebuild} | 0 .../dev-db/etcd/etcd-0.0.1.ebuild | 2 - .../dev-db/etcd/etcd-99999.ebuild | 2 - .../dev-db/etcd/files/block-until-url | 7 ---- .../dev-db/etcd/files/coreos-c10n | 40 ------------------- .../dev-db/etcd/files/etcd-bootstrap | 2 - .../dev-db/etcd/files/etcd.service | 5 +++ 7 files changed, 5 insertions(+), 53 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.0.1-r5.ebuild => etcd-0.0.1-r6.ebuild} (100%) delete mode 100755 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/block-until-url delete mode 100755 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild index fef8e87cd0..c688066e17 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild @@ -31,10 +31,8 @@ src_compile() { src_install() { dobin ${S}/${PN} - dobin ${FILESDIR}/coreos-c10n dobin ${FILESDIR}/etcd-bootstrap dobin ${FILESDIR}/etcd-pre-exec - dobin ${FILESDIR}/block-until-url keepdir /var/lib/${PN} fowners etcd:etcd /var/lib/${PN} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild index 5b5d0051e9..edbdd0b288 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild @@ -30,10 +30,8 @@ src_compile() { src_install() { dobin ${S}/${PN} - dobin ${FILESDIR}/coreos-c10n dobin ${FILESDIR}/etcd-bootstrap dobin ${FILESDIR}/etcd-pre-exec - dobin ${FILESDIR}/block-until-url keepdir /var/lib/${PN} fowners etcd:etcd /var/lib/${PN} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/block-until-url b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/block-until-url deleted file mode 100755 index 4a790cc15e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/block-until-url +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -URL="$1" - -CMD="curl -s --capath /usr/share/coreos-ca-certificates/ --capath /etc/ssl/certs/ $URL" -while ($CMD > /dev/null); [ $? -ne 0 ]; - do sleep .5; done diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n deleted file mode 100755 index 0c91b65d1c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -VIRT=$(coreos-detect-virt) - -if [ "${VIRT}" != "ec2" ]; then - # all of this is currently dependent on ec2, we'll refactor as we add more images - exit 0 -fi - -C10N_ENDPOINT=https://core-api.appspot.com/v1/c10n/group -META_URL="http://169.254.169.254/latest" - -ETCD_BOOTSTRAP="/var/run/etcd/bootstrap.config" - -/usr/bin/block-until-url $C10N_ENDPOINT -/usr/bin/block-until-url $META_URL - -USER_DATA=$(curl -s --fail $META_URL/user-data) -if [ $? -eq 0 ] && [ ! -z "$USER_DATA" ]; then - URL=$USER_DATA - - echo $URL | grep -q '^https://' || (echo Coordination URL requires valid SSL; exit 1) - - TMP=`mktemp` - - curl -s "$USER_DATA/raw" > $TMP - - # validate ssh key - ssh-keygen -l -f $TMP > /dev/null 2>&1 - if [ $? -eq 0 ]; then - cat $TMP >> /home/core/.ssh/authorized_keys - echo "SSH key updated" - chown -R core: /home/core/.ssh/ - else - echo "Not a valid ssh key" - fi -fi - -IP=$(curl -s $META_URL/meta-data/local-ipv4) -curl -s $C10N_ENDPOINT -d "c10n_url=$URL" -d"ip_list=$IP" > $ETCD_BOOTSTRAP diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap index a1a5f7d1ee..49f0c1c276 100755 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap @@ -10,8 +10,6 @@ if [ "${VIRT}" != "ec2" ]; then exec /usr/bin/etcd -v -d $STATE fi -/usr/bin/coreos-c10n - META_URL="http://169.254.169.254/latest" MY_IP=$(curl -s $META_URL/meta-data/local-ipv4) BOOTSTRAP="/var/run/etcd/bootstrap.config" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service index 728b8609fd..6a65b7eed1 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service @@ -1,3 +1,8 @@ +[Unit] +Description=etcd +Wants=coreos-c10n.service +After=coreos-c10n.service + [Service] User=etcd PermissionsStartOnly=true