coreos/azure: Remove workaround coreos/bugs#267 -

it turned out the issue was due to the domain lenght, so let's just
keep it short.
This commit is contained in:
Ilya Dmitrichenko 2015-03-09 17:33:07 +00:00
parent cc9f6b1f79
commit 5deff8b2be
4 changed files with 2 additions and 31 deletions

View File

@ -10,11 +10,6 @@ coreos:
snapshot: true
max-retry-attempts: 50
units:
- name: dhcpcd.service
enable: true
command: start
- name: systemd-resolved.service
command: stop
- name: etcd.service
command: start
update:

View File

@ -29,30 +29,6 @@ coreos:
[Service]
Environment=DOCKER_OPTS='--bridge="weave" -r="false"'
- name: dhcpcd.service
enable: true
command: start
- name: systemd-resolved.service
command: stop
- name: wait-for-network-online.service
enable: true
command: start
content: |
[Unit]
After=network-online.target
Before=install-weave.service
Before=download-kubernetes.service
Description=Temporary hack, as the use of dhcpcd.service breaks nework-online.online
Documentation=https://github.com/coreos/bugs/issues/267
Requires=network-online.target
[Service]
Type=oneshot
ExecStart=/bin/sh -c 'until curl --silent --fail https://status.github.com/api/status.json | grep -q \"good\"; do sleep 2; done'
[Install]
WantedBy=network-online.target
- name: weave-network.target
enable: true
content: |

View File

@ -3,7 +3,7 @@
var azure = require('./lib/azure_wrapper.js');
var kube = require('./lib/deployment_logic/kubernetes.js');
azure.create_config('kubernetes', { 'etcd': 3, 'kube': 3 });
azure.create_config('kube', { 'etcd': 3, 'kube': 3 });
azure.run_task_queue([
azure.queue_default_network(),

View File

@ -227,7 +227,7 @@ exports.create_config = function (name, nodes) {
weave_salt: util.rand_string(),
resources: {
vnet: [name, 'internal-vnet', util.rand_suffix].join('-'),
service: [name, 'service-cluster', util.rand_suffix].join('-'),
service: [name, util.rand_suffix].join('-'),
ssh_key: create_ssh_key(name),
}
};