-
-
Save joejulian/04bb9ecb66fb023f2c96ec9528aac3ad to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/state/colonybead/cloud-config/etcd.cloud-config.yaml b/state/colonybead/cloud-config/etcd.cloud-config.yaml | |
| index 6d7fe71..0c08b0a 100644 | |
| --- a/state/colonybead/cloud-config/etcd.cloud-config.yaml | |
| +++ b/state/colonybead/cloud-config/etcd.cloud-config.yaml | |
| @@ -12,24 +12,15 @@ write_files: | |
| H4sIAGPfSVgC/22Vtw6sagKDe57i9uiInEpy+IEZGHIHDGnIOTz9nrvbrls3ny1Z/vPnrwRZ1e1/3A//z9vVA96T/wFy/K/xB7J0XR5PXeB5IPKOzD8aw+UWAm8vzAaViTlvMR7qTYt5rxvtmnwNRUgtFvv2DNFGzAf6/FgvozbQgnLMPqY+cFy3tkvdJBOncXa7rbpHCNmHX5YyQUiGx4m3dDy8MaxYh6BfCO4pMExl/So9l9bpoap4uPjiFo6vdZ+tQXjUMl+mRn/ls9KFT8l8WVEfNQx2NIm5HWgoQ3X+PvPq+j/+Nmk6EvHdZvdCSwu6BuBLtc9OWIHgA+ukWe+yv1hUiPximI1Q4BZ0s8Zj97dzsj4yp7NtLq71karzMMZ0P5h2SPOw31TpM1d+BNvVeI8vVzcJEANHQPgLmro0Najr7XccoRhJtu8HrCEN9fiO6JHOirJsyDm6xDu8wI9/y1bOtfWr/KXT1sZyJsRUlZkOLFVrFGJPKlfZL2pnsxh/xtnxUvgiQEayZtgrqjRE53PFxvwhG+Xk11nFHRfiLeFA28NmIjto+WB5+shwXS52M+ezfFSdzSmpVTIPm9GVtUTV1MCYxyI6Cg++vycc0rw4wkM4UfQg+lKoMAhLbceWhyko3psM8vK0rf2yKC2yFH3X3UPO+4ILwPcOqS9xD/IqR8FZqpxxDhmNqpuz2ktMA8Z+9qbhPpw/gbr/fDL9WUnCwKbWPVthW1+kYCMltV3oZU/TarQuP4SeQrHUku/8qbRVTpL5etWsm86JbJwDIvk9nOqWcgq1Qy0iTAJ1PWkD6o45/1ayWMUyT0uSN07e+WV+rBpjG92bObi4+eILNuOomQNmf0+U7wcL+T2MbcXVAFLZ9iZ+nEXoV81Iu8hPPFzmXDH0p3OQlbeSStCFZyc9vkBNpZbuq4lbfrAKF6KNlAO9tBPVsaF5F3QaI1uAcmuD/aZOuYHb37GxGKz8FPPLJ3NBxoeOHJbI2/9HTEb5CFWvhLQJgmryE16oS9c/n4PxOp2wm+zUHAvWktA8DrTrQVo4rvO2azUbwRWDiBSEmIACgNGSnki37yUP5oPlHGBO3VIMxgRE5Wf8OnZvgrNRaChnGNdkYXtq4A7aTqq0PDcoCf2R4ZmANFDw6TDEMguRureRpL2pQHhJqzaDmfy/yMLXlYu9K9gOF3fpEprnWBwGmptRupodNhGXrcqMvWfaIPHI2nNwIpr4XdOFtj9tMHfj8L5OV4kHv4uaIZZyXFRIA2q4dqI8JJleJ9G4JJrgZY1Wkm3Xfocjs+SWv6jsjaMRe1H/6gevxijrE6tQDzwR4T8o6H7NWsTL4xJohTuX9pOq2AFC5UiV3oGnClsUdX9qnhla4uURoLgzaKoeJZKPER8RFHJXZ/7NTSrZcu4Hyerc7wS3U6conK9ck6sjUIKvsAuU+ojheKtt0mXf31texW7iJIhoJ49fDnQLOOUC06LnsCUqBXUm9iK+nRJpkt7WFXs4kfqOri2nJR7UnZKowVFmLwaaZEXG/0Xmf38XsHetVtfFk2/SrrZqXIE+8MBS9v6P8wyzSMLTC7NWkse2sekon07o5FkT9LFBxJdYcG749u+oVQM8VipApTwnM7XX3q55MFmrY+weL5FCYGHR12P/eL8vRMutBwtKPg71CgIs3neZaKWWWLDj3RJ1nV04NZgpmH0jc9qIWJkXAf33UmRb+r9X8x86AUSvigYAAA== | |
| coreos: | |
| units: | |
| - - name: kraken-networking.service | |
| - command: start | |
| - content: | | |
| - [Unit] | |
| - Description=Setup Network Environment | |
| - Requires=network-online.target | |
| - After=network-online.target | |
| - [Service] | |
| - RemainAfterExit=yes | |
| - Type=oneshot | |
| - ExecStart=/usr/bin/rkt run \ | |
| - --insecure-options=image \ | |
| - --net=host \ | |
| - --inherit-env=true \ | |
| - --volume etc,kind=host,source=/etc,readOnly=false \ | |
| - --mount volume=etc,target=/etc \ | |
| - quay.io/samsung_cnct/setup-network-environment:v1.0.1-mv | |
| - ExecStopPost=/usr/bin/rkt gc --mark-only | |
| + - name: docker.service | |
| + drop-ins: | |
| + - name: 10-wait-docker.conf | |
| + content: | | |
| + [Unit] | |
| + After=var-lib-docker.mount | |
| + Requires=var-lib-docker.mount | |
| + After=ephemeral.mount | |
| + Requires=ephemeral.mount | |
| - name: format-storage-xvdf.service | |
| command: start | |
| content: | | |
| @@ -75,15 +66,24 @@ coreos: | |
| What=/dev/xvdg | |
| Where=/ephemeral | |
| Type=ext4 | |
| - - name: docker.service | |
| - drop-ins: | |
| - - name: 10-wait-docker.conf | |
| - content: | | |
| - [Unit] | |
| - After=var-lib-docker.mount | |
| - Requires=var-lib-docker.mount | |
| - After=ephemeral.mount | |
| - Requires=ephemeral.mount | |
| + - name: kraken-networking.service | |
| + command: start | |
| + content: | | |
| + [Unit] | |
| + Description=Setup Network Environment | |
| + Requires=network-online.target | |
| + After=network-online.target | |
| + [Service] | |
| + RemainAfterExit=yes | |
| + Type=oneshot | |
| + ExecStart=/usr/bin/rkt run \ | |
| + --insecure-options=image \ | |
| + --net=host \ | |
| + --inherit-env=true \ | |
| + --volume etc,kind=host,source=/etc,readOnly=false \ | |
| + --mount volume=etc,target=/etc \ | |
| + quay.io/samsung_cnct/setup-network-environment:v1.0.1-mv | |
| + ExecStopPost=/usr/bin/rkt gc --mark-only | |
| - name: kraken-etcd.service | |
| command: start | |
| content: | | |
| @@ -116,7 +116,7 @@ coreos: | |
| --mount volume=resolv-conf,target=/etc/resolv.conf \ | |
| quay.io/coreos/etcd:v3.1.0 \ | |
| -- --data-dir /ephemeral/etcd \ | |
| - --name etcdetcd \ | |
| + --name etcdetcd${DEFAULT_IPV4} \ | |
| --peer-client-cert-auth \ | |
| --peer-trusted-ca-file=/etc/etcd/ssl/peer-ca.pem \ | |
| --peer-cert-file=/etc/etcd/ssl/peer.pem \ | |
| @@ -156,7 +156,7 @@ coreos: | |
| --set-env=HOST_IP=${DEFAULT_IPV4} \ | |
| --set-env=SERVICE_DNS_NAME=etcd.colonybead.internal \ | |
| --set-env=HOST_DNS_NAME=*.etcd.colonybead.internal \ | |
| - quay.io/samsung_cnct/drunkensmee:v0.5 \ | |
| + quay.io/samsung_cnct/drunkensmee:v0.6 \ | |
| --exec /assets/generate_etcd.sh | |
| ExecStopPost=/usr/bin/rkt gc --mark-only | |
| update: | |
| diff --git a/state/colonybead/cloud-config/etcdEvents.cloud-config.yaml b/state/colonybead/cloud-config/etcdEvents.cloud-config.yaml | |
| index ff5aa12..68143d1 100644 | |
| --- a/state/colonybead/cloud-config/etcdEvents.cloud-config.yaml | |
| +++ b/state/colonybead/cloud-config/etcdEvents.cloud-config.yaml | |
| @@ -12,24 +12,15 @@ write_files: | |
| H4sIAGPfSVgC/22Vtw6sagKDe57i9uiInEpy+IEZGHIHDGnIOTz9nrvbrls3ny1Z/vPnrwRZ1e1/3A//z9vVA96T/wFy/K/xB7J0XR5PXeB5IPKOzD8aw+UWAm8vzAaViTlvMR7qTYt5rxvtmnwNRUgtFvv2DNFGzAf6/FgvozbQgnLMPqY+cFy3tkvdJBOncXa7rbpHCNmHX5YyQUiGx4m3dDy8MaxYh6BfCO4pMExl/So9l9bpoap4uPjiFo6vdZ+tQXjUMl+mRn/ls9KFT8l8WVEfNQx2NIm5HWgoQ3X+PvPq+j/+Nmk6EvHdZvdCSwu6BuBLtc9OWIHgA+ukWe+yv1hUiPximI1Q4BZ0s8Zj97dzsj4yp7NtLq71karzMMZ0P5h2SPOw31TpM1d+BNvVeI8vVzcJEANHQPgLmro0Najr7XccoRhJtu8HrCEN9fiO6JHOirJsyDm6xDu8wI9/y1bOtfWr/KXT1sZyJsRUlZkOLFVrFGJPKlfZL2pnsxh/xtnxUvgiQEayZtgrqjRE53PFxvwhG+Xk11nFHRfiLeFA28NmIjto+WB5+shwXS52M+ezfFSdzSmpVTIPm9GVtUTV1MCYxyI6Cg++vycc0rw4wkM4UfQg+lKoMAhLbceWhyko3psM8vK0rf2yKC2yFH3X3UPO+4ILwPcOqS9xD/IqR8FZqpxxDhmNqpuz2ktMA8Z+9qbhPpw/gbr/fDL9WUnCwKbWPVthW1+kYCMltV3oZU/TarQuP4SeQrHUku/8qbRVTpL5etWsm86JbJwDIvk9nOqWcgq1Qy0iTAJ1PWkD6o45/1ayWMUyT0uSN07e+WV+rBpjG92bObi4+eILNuOomQNmf0+U7wcL+T2MbcXVAFLZ9iZ+nEXoV81Iu8hPPFzmXDH0p3OQlbeSStCFZyc9vkBNpZbuq4lbfrAKF6KNlAO9tBPVsaF5F3QaI1uAcmuD/aZOuYHb37GxGKz8FPPLJ3NBxoeOHJbI2/9HTEb5CFWvhLQJgmryE16oS9c/n4PxOp2wm+zUHAvWktA8DrTrQVo4rvO2azUbwRWDiBSEmIACgNGSnki37yUP5oPlHGBO3VIMxgRE5Wf8OnZvgrNRaChnGNdkYXtq4A7aTqq0PDcoCf2R4ZmANFDw6TDEMguRureRpL2pQHhJqzaDmfy/yMLXlYu9K9gOF3fpEprnWBwGmptRupodNhGXrcqMvWfaIPHI2nNwIpr4XdOFtj9tMHfj8L5OV4kHv4uaIZZyXFRIA2q4dqI8JJleJ9G4JJrgZY1Wkm3Xfocjs+SWv6jsjaMRe1H/6gevxijrE6tQDzwR4T8o6H7NWsTL4xJohTuX9pOq2AFC5UiV3oGnClsUdX9qnhla4uURoLgzaKoeJZKPER8RFHJXZ/7NTSrZcu4Hyerc7wS3U6conK9ck6sjUIKvsAuU+ojheKtt0mXf31texW7iJIhoJ49fDnQLOOUC06LnsCUqBXUm9iK+nRJpkt7WFXs4kfqOri2nJR7UnZKowVFmLwaaZEXG/0Xmf38XsHetVtfFk2/SrrZqXIE+8MBS9v6P8wyzSMLTC7NWkse2sekon07o5FkT9LFBxJdYcG749u+oVQM8VipApTwnM7XX3q55MFmrY+weL5FCYGHR12P/eL8vRMutBwtKPg71CgIs3neZaKWWWLDj3RJ1nV04NZgpmH0jc9qIWJkXAf33UmRb+r9X8x86AUSvigYAAA== | |
| coreos: | |
| units: | |
| - - name: kraken-networking.service | |
| - command: start | |
| - content: | | |
| - [Unit] | |
| - Description=Setup Network Environment | |
| - Requires=network-online.target | |
| - After=network-online.target | |
| - [Service] | |
| - RemainAfterExit=yes | |
| - Type=oneshot | |
| - ExecStart=/usr/bin/rkt run \ | |
| - --insecure-options=image \ | |
| - --net=host \ | |
| - --inherit-env=true \ | |
| - --volume etc,kind=host,source=/etc,readOnly=false \ | |
| - --mount volume=etc,target=/etc \ | |
| - quay.io/samsung_cnct/setup-network-environment:v1.0.1-mv | |
| - ExecStopPost=/usr/bin/rkt gc --mark-only | |
| + - name: docker.service | |
| + drop-ins: | |
| + - name: 10-wait-docker.conf | |
| + content: | | |
| + [Unit] | |
| + After=var-lib-docker.mount | |
| + Requires=var-lib-docker.mount | |
| + After=ephemeral.mount | |
| + Requires=ephemeral.mount | |
| - name: format-storage-xvdf.service | |
| command: start | |
| content: | | |
| @@ -75,15 +66,24 @@ coreos: | |
| What=/dev/xvdg | |
| Where=/ephemeral | |
| Type=ext4 | |
| - - name: docker.service | |
| - drop-ins: | |
| - - name: 10-wait-docker.conf | |
| - content: | | |
| - [Unit] | |
| - After=var-lib-docker.mount | |
| - Requires=var-lib-docker.mount | |
| - After=ephemeral.mount | |
| - Requires=ephemeral.mount | |
| + - name: kraken-networking.service | |
| + command: start | |
| + content: | | |
| + [Unit] | |
| + Description=Setup Network Environment | |
| + Requires=network-online.target | |
| + After=network-online.target | |
| + [Service] | |
| + RemainAfterExit=yes | |
| + Type=oneshot | |
| + ExecStart=/usr/bin/rkt run \ | |
| + --insecure-options=image \ | |
| + --net=host \ | |
| + --inherit-env=true \ | |
| + --volume etc,kind=host,source=/etc,readOnly=false \ | |
| + --mount volume=etc,target=/etc \ | |
| + quay.io/samsung_cnct/setup-network-environment:v1.0.1-mv | |
| + ExecStopPost=/usr/bin/rkt gc --mark-only | |
| - name: kraken-etcd.service | |
| command: start | |
| content: | | |
| @@ -116,7 +116,7 @@ coreos: | |
| --mount volume=resolv-conf,target=/etc/resolv.conf \ | |
| quay.io/coreos/etcd:v3.1.0 \ | |
| -- --data-dir /ephemeral/etcd \ | |
| - --name etcdetcdEvents \ | |
| + --name etcdetcdEvents${DEFAULT_IPV4} \ | |
| --peer-client-cert-auth \ | |
| --peer-trusted-ca-file=/etc/etcd/ssl/peer-ca.pem \ | |
| --peer-cert-file=/etc/etcd/ssl/peer.pem \ | |
| @@ -156,7 +156,7 @@ coreos: | |
| --set-env=HOST_IP=${DEFAULT_IPV4} \ | |
| --set-env=SERVICE_DNS_NAME=etcdEvents.colonybead.internal \ | |
| --set-env=HOST_DNS_NAME=*.etcdEvents.colonybead.internal \ | |
| - quay.io/samsung_cnct/drunkensmee:v0.5 \ | |
| + quay.io/samsung_cnct/drunkensmee:v0.6 \ | |
| --exec /assets/generate_etcd.sh | |
| ExecStopPost=/usr/bin/rkt gc --mark-only | |
| update: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment