diff options
| -rw-r--r-- | blueprints/DockerBP.yaml-template | 20 | ||||
| -rw-r--r-- | blueprints/cdapbp7.yaml-template | 10 |
2 files changed, 10 insertions, 20 deletions
diff --git a/blueprints/DockerBP.yaml-template b/blueprints/DockerBP.yaml-template index 000fe58..32ee931 100644 --- a/blueprints/DockerBP.yaml-template +++ b/blueprints/DockerBP.yaml-template @@ -37,6 +37,10 @@ inputs: location_id: description: the location ID for the location where the Docker hsot is being deployed type: string + target_datacenter: + description: |- + This is the name of the target Consul datacenter that the docker host will try to join + type: string registrator_image: description: |- Full uri to registrator Docker image. Note! You should be using the forked version of @@ -56,9 +60,6 @@ inputs: private_net: type: string openstack: {} - fake_designate: - type: string - default: '' keypair: type: string location_prefix: @@ -126,9 +127,10 @@ inputs: mkdir -p /opt/consul/config /opt/consul/data /opt/consul/bin # Download Consul from Nexus - curl -Ss https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_amd64.zip > /opt/consul/bin/consul_0.8.3_linux_amd64 - chmod +x /opt/consul/bin/consul_0.8.3_linux_amd64 - ln -s /opt/consul/bin/consul_0.8.3_linux_amd64 /opt/consul/bin/consul + apt-get update + DEBIAN_FRONTEND=noninteractive apt-get install -y -q unzip + curl -Ss https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_amd64.zip > /opt/consul/bin/consul_0.8.3_linux_amd64.zip + unzip /opt/consul/bin/consul_0.8.3_linux_amd64.zip cat <<EOF > /opt/consul/config/consul.json { "bind_addr" : "0.0.0.0", @@ -185,7 +187,6 @@ inputs: sleep 60 done - apt-get update DEBIAN_FRONTEND=noninteractive apt-get install -y -q linux-image-extra-`uname -r` linux-image-extra-virtual apparmor dirmngr DEBIAN_FRONTEND=noninteractive apt-get install -y -q docker.io echo 'DOCKER_OPTS="--raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock"' >>/etc/default/docker @@ -233,10 +234,9 @@ node_templates: args: floating_network_name: { get_input: public_net } dns_dokr00: - type: dcae.nodes.dns.arecord + type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, { get_input: node_name }, '.', { get_input: location_domain } ] } - fakeurl: { get_input: fake_designate } openstack: *open_conf interfaces: cloudify.interfaces.lifecycle: @@ -265,7 +265,7 @@ node_templates: userdata: concat: - { get_input: vm_init_dokr_00 } - - { get_input: location_id } + - { get_input: target_datacenter } - |+ - { get_input: vm_init_dokr_01 } diff --git a/blueprints/cdapbp7.yaml-template b/blueprints/cdapbp7.yaml-template index 4480d9a..d9c529b 100644 --- a/blueprints/cdapbp7.yaml-template +++ b/blueprints/cdapbp7.yaml-template @@ -45,9 +45,6 @@ inputs: private_net: type: string openstack: {} - fake_designate: - type: string - default: '' keypair: type: string location_prefix: @@ -152,7 +149,6 @@ node_templates: type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, 'cdap00.', { get_input: location_domain } ] } - fakeurl: { get_input: fake_designate } openstack: *open_conf interfaces: cloudify.interfaces.lifecycle: @@ -285,7 +281,6 @@ node_templates: type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, 'cdap01.', { get_input: location_domain } ] } - fakeurl: { get_input: fake_designate } openstack: *open_conf interfaces: cloudify.interfaces.lifecycle: @@ -418,7 +413,6 @@ node_templates: type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, 'cdap02.', { get_input: location_domain } ] } - fakeurl: { get_input: fake_designate } openstack: *open_conf interfaces: cloudify.interfaces.lifecycle: @@ -555,7 +549,6 @@ node_templates: type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, 'cdap03.', { get_input: location_domain } ] } - fakeurl: { get_input: fake_designate } openstack: *open_conf interfaces: cloudify.interfaces.lifecycle: @@ -688,7 +681,6 @@ node_templates: type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, 'cdap04.', { get_input: location_domain } ] } - fakeurl: { get_input: fake_designate } openstack: *open_conf interfaces: cloudify.interfaces.lifecycle: @@ -821,7 +813,6 @@ node_templates: type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, 'cdap05.', { get_input: location_domain } ] } - fakeurl: { get_input: fake_designate } openstack: *open_conf interfaces: cloudify.interfaces.lifecycle: @@ -954,7 +945,6 @@ node_templates: type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, 'cdap06.', { get_input: location_domain } ] } - fakeurl: { get_input: fake_designate } openstack: *open_conf interfaces: cloudify.interfaces.lifecycle: |