summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <bryan.strassner@gmail.com>2018-11-06 16:48:16 -0600
committerBryan Strassner <bryan.strassner@gmail.com>2018-11-07 14:22:49 -0600
commit7a9db79c8ef5c2a6dce08cf9dbdf4de3fdd36fba (patch)
tree667408d1c863e3061d10b2e9c7422a17e152cfb9
parentb01454859f88fedb1d7d9a9011394e9acfc19324 (diff)
Update to set the apiserver command
Sets the apiserver command for use during genesis to refect the service cidr and service node port range to match Treasuremap conventions (and fix a failing genesis process) Change-Id: Id1745d7734901e071e0889fe2a3dc00982156d44
Notes
Notes (review): Code-Review+2: Aaron Sheffield <ajs@sheffieldfamily.net> Code-Review+1: Dan Crank <dan.no@att.com> Code-Review+2: Matt McEuen <matt.mceuen@att.com> Workflow+1: Matt McEuen <matt.mceuen@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 07 Nov 2018 23:41:50 +0000 Reviewed-on: https://review.openstack.org/616023 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/profiles/genesis.yaml25
-rw-r--r--deployment_files/global/v1.0dev/profiles/genesis.yaml25
-rw-r--r--deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml1
-rw-r--r--deployment_files/site/demo/networks/common-addresses.yaml1
-rw-r--r--deployment_files/site/dev-proxy/networks/common-addresses.yaml1
-rw-r--r--deployment_files/site/dev/networks/common-addresses.yaml1
-rw-r--r--deployment_files/site/gate-multinode/networks/common-addresses.yaml1
7 files changed, 55 insertions, 0 deletions
diff --git a/deployment_files/global/v1.0demo/profiles/genesis.yaml b/deployment_files/global/v1.0demo/profiles/genesis.yaml
index cfbc04c..7420a83 100644
--- a/deployment_files/global/v1.0demo/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0demo/profiles/genesis.yaml
@@ -67,7 +67,32 @@ metadata:
67 path: .dns.node_domain 67 path: .dns.node_domain
68 dest: 68 dest:
69 path: .domain 69 path: .domain
70
71 # Command prefix
72 - src:
73 schema: pegleg/CommonAddresses/v1
74 name: common-addresses
75 path: .kubernetes.service_cidr
76 dest:
77 path: .apiserver.command_prefix[1]
78 pattern: SERVICE_CIDR
79 - src:
80 schema: pegleg/CommonAddresses/v1
81 name: common-addresses
82 path: .kubernetes.service_node_port_range
83 dest:
84 path: .apiserver.command_prefix[2]
85 pattern: SERVICE_NODE_PORT_RANGE
86
70data: 87data:
88 apiserver:
89 command_prefix:
90 - /apiserver
91 - --service-cluster-ip-range=SERVICE_CIDR
92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 - --authorization-mode=Node,RBAC
94 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
95 - --endpoint-reconciler-type=lease
71 armada: 96 armada:
72 target_manifest: cluster-bootstrap 97 target_manifest: cluster-bootstrap
73 labels: 98 labels:
diff --git a/deployment_files/global/v1.0dev/profiles/genesis.yaml b/deployment_files/global/v1.0dev/profiles/genesis.yaml
index fe0eb09..0d3f8dc 100644
--- a/deployment_files/global/v1.0dev/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0dev/profiles/genesis.yaml
@@ -67,7 +67,32 @@ metadata:
67 path: .dns.node_domain 67 path: .dns.node_domain
68 dest: 68 dest:
69 path: .domain 69 path: .domain
70
71 # Command prefix
72 - src:
73 schema: pegleg/CommonAddresses/v1
74 name: common-addresses
75 path: .kubernetes.service_cidr
76 dest:
77 path: .apiserver.command_prefix[1]
78 pattern: SERVICE_CIDR
79 - src:
80 schema: pegleg/CommonAddresses/v1
81 name: common-addresses
82 path: .kubernetes.service_node_port_range
83 dest:
84 path: .apiserver.command_prefix[2]
85 pattern: SERVICE_NODE_PORT_RANGE
86
70data: 87data:
88 apiserver:
89 command_prefix:
90 - /apiserver
91 - --service-cluster-ip-range=SERVICE_CIDR
92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 - --authorization-mode=Node,RBAC
94 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
95 - --endpoint-reconciler-type=lease
71 armada: 96 armada:
72 target_manifest: cluster-bootstrap 97 target_manifest: cluster-bootstrap
73 labels: 98 labels:
diff --git a/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml b/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml
index 8fd4a3c..12f9b5b 100644
--- a/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml
+++ b/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml
@@ -141,3 +141,4 @@ data:
141 - images 141 - images
142 - labels 142 - labels
143 additionalProperties: false 143 additionalProperties: false
144...
diff --git a/deployment_files/site/demo/networks/common-addresses.yaml b/deployment_files/site/demo/networks/common-addresses.yaml
index a74b7ae..9792c42 100644
--- a/deployment_files/site/demo/networks/common-addresses.yaml
+++ b/deployment_files/site/demo/networks/common-addresses.yaml
@@ -77,6 +77,7 @@ data:
77 service_cidr: 10.96.0.0/16 77 service_cidr: 10.96.0.0/16
78 apiserver_port: 6443 78 apiserver_port: 6443
79 haproxy_port: 6553 79 haproxy_port: 6553
80 service_node_port_range: 30000-32767
80 81
81 etcd: 82 etcd:
82 container_port: 2379 83 container_port: 2379
diff --git a/deployment_files/site/dev-proxy/networks/common-addresses.yaml b/deployment_files/site/dev-proxy/networks/common-addresses.yaml
index de87d48..4e824f5 100644
--- a/deployment_files/site/dev-proxy/networks/common-addresses.yaml
+++ b/deployment_files/site/dev-proxy/networks/common-addresses.yaml
@@ -77,6 +77,7 @@ data:
77 service_cidr: 10.96.0.0/16 77 service_cidr: 10.96.0.0/16
78 apiserver_port: 6443 78 apiserver_port: 6443
79 haproxy_port: 6553 79 haproxy_port: 6553
80 service_node_port_range: 30000-32767
80 81
81 etcd: 82 etcd:
82 container_port: 2379 83 container_port: 2379
diff --git a/deployment_files/site/dev/networks/common-addresses.yaml b/deployment_files/site/dev/networks/common-addresses.yaml
index a74b7ae..9792c42 100644
--- a/deployment_files/site/dev/networks/common-addresses.yaml
+++ b/deployment_files/site/dev/networks/common-addresses.yaml
@@ -77,6 +77,7 @@ data:
77 service_cidr: 10.96.0.0/16 77 service_cidr: 10.96.0.0/16
78 apiserver_port: 6443 78 apiserver_port: 6443
79 haproxy_port: 6553 79 haproxy_port: 6553
80 service_node_port_range: 30000-32767
80 81
81 etcd: 82 etcd:
82 container_port: 2379 83 container_port: 2379
diff --git a/deployment_files/site/gate-multinode/networks/common-addresses.yaml b/deployment_files/site/gate-multinode/networks/common-addresses.yaml
index 99efb1d..9c50fd5 100644
--- a/deployment_files/site/gate-multinode/networks/common-addresses.yaml
+++ b/deployment_files/site/gate-multinode/networks/common-addresses.yaml
@@ -35,6 +35,7 @@ data:
35 service_cidr: 10.96.0.0/16 35 service_cidr: 10.96.0.0/16
36 apiserver_port: 6443 36 apiserver_port: 6443
37 haproxy_port: 6553 37 haproxy_port: 6553
38 service_node_port_range: 30000-32767
38 39
39 etcd: 40 etcd:
40 container_port: 2379 41 container_port: 2379